From 749044e9cd94ba864017e0eefb17469cd1f6770d Mon Sep 17 00:00:00 2001 From: cl <418351270@qq.com> Date: 星期二, 16 一月 2024 14:07:23 +0800 Subject: [PATCH] 修改生成操作 --- jcdm-ui/src/views/main/bs/orderScheduling/index.vue | 7 +++---- jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 45 +++++++++++++++++++++++++++++++++------------ 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java index 9fd7ff5..b1f62a8 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java +++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java @@ -7,6 +7,8 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.jcdm.main.bs.modelNumber.domain.BsModelNumber; +import com.jcdm.main.bs.modelNumber.service.IBsModelNumberService; import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling; import com.jcdm.main.bs.orderScheduling.service.IBsOrderSchedulingService; import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo; @@ -47,6 +49,9 @@ @Autowired private IBsOrderSchedulingService bsOrderSchedulingService; + + @Autowired + private IBsModelNumberService bsModelNumberService; /** * 鏌ヨ鐢熶骇宸ュ崟鍒楄〃 @@ -106,24 +111,40 @@ DateTimeFormatter formatter= DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); //灏嗘椂闂磋浆鍖栦负瀵瑰簲鏍煎紡鐨勫瓧绗︿覆 String fomateDate=date.format(formatter).toString(); + + Integer startCode = Integer.parseInt(omProductionOrdeInfo.getStartCode());//寮�濮嬬紪鍙� Integer planQty = Math.toIntExact(omProductionOrdeInfo.getPlanQty());//璁″垝鏁伴噺 String dateTimeRule = omProductionOrdeInfo.getDateTimeRule(); - for(int i=0;i<planQty;i++){ - BsOrderScheduling bsOrderScheduling = new BsOrderScheduling(); - bsOrderScheduling.setOrderNo(omProductionOrdeInfo.getWorkOrderNo()); - bsOrderScheduling.setModel(omProductionOrdeInfo.getTypeZ()); - bsOrderScheduling.setEngineNo(omProductionOrdeInfo.getTypeZ() + " "+dateTimeRule+ StringUtils.leftPad(String.valueOf(startCode),3, "0")); - bsOrderScheduling.setProductionStatus("1"); - bsOrderScheduling.setOperator(getUserName()); - bsOrderScheduling.setOperateTime(fomateDate); - bsOrderSchedulingService.insertBsOrderScheduling(bsOrderScheduling); - startCode ++; - } + String engineNo = ""; + if(planQty>0) { + for (int i = 0; i < planQty; i++) { + engineNo = omProductionOrdeInfo.getTypeZ() + " " + dateTimeRule + StringUtils.leftPad(String.valueOf(startCode), 3, "0"); + BsOrderScheduling bsOrderScheduling = new BsOrderScheduling(); + bsOrderScheduling.setOrderNo(omProductionOrdeInfo.getWorkOrderNo()); + bsOrderScheduling.setModel(omProductionOrdeInfo.getTypeZ()); + bsOrderScheduling.setEngineNo(engineNo); + bsOrderScheduling.setProductionStatus("1"); + bsOrderScheduling.setOperator(getUserName()); + bsOrderScheduling.setOperateTime(fomateDate); + bsOrderSchedulingService.insertBsOrderScheduling(bsOrderScheduling); + startCode++; + } - omProductionOrdeInfo.setOrderStatus("2");//鏇存柊宸ュ崟鐘舵�� + //鏂板鏈哄瀷搴忓彿 + BsModelNumber bsModelNumber = new BsModelNumber(); + bsModelNumber.setModel(omProductionOrdeInfo.getTypeZ()); + bsModelNumber.setModelDate(dateTimeRule); + bsModelNumber.setMaxnumValue((startCode - 1) + ""); + bsModelNumber.setSaveTime(fomateDate); + bsModelNumberService.insertBsModelNumber(bsModelNumber); + } + //鏇存柊宸ュ崟鐘舵�� + omProductionOrdeInfo.setOrderStatus("2"); return toAjax(omProductionOrdeInfoService.updateOmProductionOrdeInfo(omProductionOrdeInfo)); + + } /** diff --git a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue index fa8bbc9..3ff57bd 100644 --- a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue +++ b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue @@ -191,11 +191,10 @@ <el-table border v-loading="loading" :data="orderSchedulingList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> - <el-table-column label="ID" align="center" prop="id" /> - <el-table-column label="璁㈠崟缂栧彿" align="center" prop="orderNo"> + <el-table-column label="璁㈠崟缂栧彿" align="center" prop="orderNo" width="130"> </el-table-column> - <el-table-column label="鍙戝姩鏈哄彿" align="center" prop="engineNo"> + <el-table-column label="鍙戝姩鏈哄彿" align="center" prop="engineNo" width="150"> </el-table-column> <el-table-column label="浜у搧绫诲瀷" align="center" prop="productType"> @@ -234,7 +233,7 @@ <el-table-column label="鎿嶄綔浜�" align="center" prop="operator"> </el-table-column> - <el-table-column label="鎿嶄綔鏃堕棿" align="center" prop="operateTime"> + <el-table-column label="鎿嶄綔鏃堕棿" align="center" prop="operateTime" width="160"> </el-table-column> <!-- <el-table-column label="鐘舵��" align="center" prop="status">--> -- Gitblit v1.9.3