diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java index 31bbaf8a..3971c4f6 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java @@ -90,12 +90,8 @@ public class SalesOrderServiceImpl implements SalesOrderService { // 插入 SalesOrderDO salesOrderDO = BeanUtils.toBean(createReqVO, SalesOrderDO.class); //订单号 - //生成订单号 - if (Objects.equals(createReqVO.getIsPush(), 1)) { - salesOrderDO.setStatus(OrderStatusEnum.DRAFT.getCode()); //设置初始状态 - } else { - salesOrderDO.setStatus(OrderStatusEnum.TO_SUBMIT_ERP.getCode()); - } + salesOrderDO.setIsPush(0); + salesOrderDO.setStatus(OrderStatusEnum.IN_PROGRESS.getCode()); String orderNumber = generateOrderNumber(salesOrderDO.getMtrlTp()); salesOrderDO.setSystemOrderNumber(orderNumber); salesOrderMapper.insert(salesOrderDO); diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java index 2c0025fd..ea18cc4d 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java @@ -99,7 +99,12 @@ public class ErpFactoryServiceImpl implements ErpFactoryService { throw exception(ERP_FACTORY_NOT_ALLOW_UPDATE); } //不允许修改除了绑定工厂名称、绑定工厂编码和操作以外的信息 - erpFactoryMapper.updateById(updateObj); + ErpFactoryDO erpFactoryDO = new ErpFactoryDO(); + erpFactoryDO.setId(updateObj.getId()); + erpFactoryDO.setRelnumber(updateObj.getRelnumber()); + erpFactoryDO.setRelnumber(updateObj.getRelnumber()); + erpFactoryDO.setOperationType(updateObj.getOperationType()); + erpFactoryMapper.updateById(erpFactoryDO); } @Override