From ae6879a7575f79d814c70781e6efc1b6218f3732 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 14 三月 2025 14:10:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
billion-main/src/main/java/com/billion/main/api/service/impl/WorkOrdersInfoServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/api/service/impl/WorkOrdersInfoServiceImpl.java b/billion-main/src/main/java/com/billion/main/api/service/impl/WorkOrdersInfoServiceImpl.java
index 6f1cff2..ddfc436 100644
--- a/billion-main/src/main/java/com/billion/main/api/service/impl/WorkOrdersInfoServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/api/service/impl/WorkOrdersInfoServiceImpl.java
@@ -40,6 +40,13 @@
try {
//淇濆瓨宸ュ崟淇℃伅
OmProductionOrderInfo omProductionOrderInfo = new OmProductionOrderInfo();
+ omProductionOrderInfo.setBodyQty(Long.valueOf("0"));
+ omProductionOrderInfo.setHeadQty(Long.valueOf("0"));
+ omProductionOrderInfo.setPreQty(Long.valueOf("0"));
+ omProductionOrderInfo.setBodyStatus("0");
+ omProductionOrderInfo.setHeadStatus("0");
+ omProductionOrderInfo.setPreStatus("0");
+ omProductionOrderInfo.setDelFlag("0");
omProductionOrderInfo.setWorkOrderNo(workOrdersInfo.getOrderNumber());
omProductionOrderInfo.setSalesOrderCode(workOrdersInfo.getBatchNumber());
omProductionOrderInfo.setProductCode(workOrdersInfo.getMaterialNumber());
@@ -49,17 +56,15 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date startTime = sdf.parse(workOrdersInfo.getStartTime());
omProductionOrderInfo.setPlanStartTime(startTime);
- omProductionOrderInfo.setRemarks(Long.valueOf(workOrdersInfo.getDescription()));
omProductionOrderInfo.setOrderStatus(workOrdersInfo.getState());
- omProductionOrderInfo.setFlag(workOrdersInfo.getFLAG());
- omProductionOrderInfoService.save(omProductionOrderInfo);
+ omProductionOrderInfo.setFlag(workOrdersInfo.getFlag());
+ omProductionOrderInfoService.insertOmProductionOrderInfo(omProductionOrderInfo);
//淇濆瓨BOM涓昏〃淇℃伅
BsBomInfo bsBomInfo = new BsBomInfo();
bsBomInfo.setBomCode(workOrdersInfo.getBomName());
- bsBomInfo.setBomName(workOrdersInfo.getBomName());
bsBomInfo.setProductCode(workOrdersInfo.getMaterialNumber());
bsBomInfo.setProductName(workOrdersInfo.getMaterialNumber());
- bsBomInfoService.save(bsBomInfo);
+ bsBomInfoService.insertBsBomInfo(bsBomInfo);
//淇濆瓨BOM瀛愯〃淇℃伅
List<WorkOrdersInfoChild> childList = workOrdersInfo.getData();
for (WorkOrdersInfoChild child : childList) {
@@ -73,7 +78,7 @@
bsBomChildInfo.setCostQty(child.getCount());
bsBomChildInfo.setChecked(child.getChecked());
bsBomChildInfo.setMaterialName(child.getMaterialName());
- bsBomChildInfoService.save(bsBomChildInfo);
+ bsBomChildInfoService.insertBsBomChildInfo(bsBomChildInfo);
}
return true;
} catch (Exception e) {
--
Gitblit v1.9.3