zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into test

Browse Source
This commit is contained in:
qianshijiang
2025-12-31 14:50:14 +08:00
parent 7bc4577ff5 9be0745c03
commit e09f094939
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java
View File

@@ -90,12 +90,8 @@ public class SalesOrderServiceImpl implements SalesOrderService {
// 插入 // 插入
SalesOrderDO salesOrderDO = BeanUtils.toBean(createReqVO, SalesOrderDO.class); SalesOrderDO salesOrderDO = BeanUtils.toBean(createReqVO, SalesOrderDO.class);
//订单号 //订单号
//生成订单号 salesOrderDO.setIsPush(0);
if (Objects.equals(createReqVO.getIsPush(), 1)) { salesOrderDO.setStatus(OrderStatusEnum.IN_PROGRESS.getCode());
salesOrderDO.setStatus(OrderStatusEnum.DRAFT.getCode()); //设置初始状态
} else {
salesOrderDO.setStatus(OrderStatusEnum.TO_SUBMIT_ERP.getCode());
}
String orderNumber = generateOrderNumber(salesOrderDO.getMtrlTp()); String orderNumber = generateOrderNumber(salesOrderDO.getMtrlTp());
salesOrderDO.setSystemOrderNumber(orderNumber); salesOrderDO.setSystemOrderNumber(orderNumber);
salesOrderMapper.insert(salesOrderDO); salesOrderMapper.insert(salesOrderDO);

7
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java
View File

@@ -99,7 +99,12 @@ public class ErpFactoryServiceImpl implements ErpFactoryService {
throw exception(ERP_FACTORY_NOT_ALLOW_UPDATE); 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 @Override