diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorderentry/SaleOrderEntryDO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorderentry/SaleOrderEntryDO.java index 260b4b7..4601653 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorderentry/SaleOrderEntryDO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorderentry/SaleOrderEntryDO.java @@ -34,7 +34,7 @@ public class SaleOrderEntryDO extends BaseDO { /** * 物料id */ - private Integer materialId; + private Long materialId; /** * 物料名称 */ diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java index 7334111..873b5a4 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java @@ -103,7 +103,6 @@ import static cn.hangtag.module.oms.enums.ErrorCodeConstants.SALE_ORDER_NOT_EXIS @AllArgsConstructor public class SaleOrderServiceImpl implements SaleOrderService { - private SaleOrderMapper saleOrderMapper; private SaleContractMapper saleContractMapper; private SaleOrderEntryMapper saleOrderEntryMapper; @@ -235,7 +234,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { @Override @Transactional(rollbackFor = Exception.class) public void updateSaleOrderBillStatus(List ids, String status){ - updateSaleOrderBillStatus(ids,status); + updateSaleOrderBillStatus(ids,status,null); } @Override @Transactional(rollbackFor = Exception.class) @@ -318,7 +317,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { message.setMail("wx782276617@foxmail.com"); message.setTitle("OMS订单系统"); message.setContent("您好,您的订单:"+saleOrder.getBillno()+",已审核通过!"); - mailSendService.doSendMail(message,new File(fileName)); + mailSendService.doSendMail(message,new File(pdfPath)); //mailSendService.doSendMail(message); } }