diff --git a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java index 68e0c82..507ca29 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java @@ -358,6 +358,26 @@ public class ScheduleController extends AbstractController { .put("total", resultList.size()); } + /** + * 更新工单BOM备注 + * @param params 参数 {site, orderNo, bomList: [{itemNo, remark}]} + * @return R + */ + @RequestMapping(value = "updateOrderBomRemark") + public R updateOrderBomRemark(@RequestBody Map params){ + try { + String site = params.get("site") != null ? params.get("site").toString() : ""; + String orderNo = params.get("orderNo") != null ? params.get("orderNo").toString() : ""; + List> bomList = (List>) params.get("bomList"); + scheduleService.updateOrderBomRemark(site, orderNo, bomList); + return R.ok() + .put("code", 0) + .put("msg", "更新成功"); + } catch (Exception e) { + return R.error(e.getMessage()); + } + } + /** * TODO 查询派工单材料上机的数据 * @author LR diff --git a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java index 157847d..e74b7f5 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java @@ -113,6 +113,7 @@ public class SearchScheduleData extends BaseData { private Float rollQty;//当前卷的良品数量 private Integer rollNums;//当前卷的数量 private List> rollRows;//排数据列表(用于创建分卷时传递每排的良品数和不良数) + private List> bomList;//材料清单列表(用于结单时更新材料备注) private String fixture;//固定载具 private boolean newRollFlag;//是否是新卷 private String specifiedTime;//是否制定排产的时间 @@ -937,6 +938,14 @@ public class SearchScheduleData extends BaseData { this.rollRows = rollRows; } + public List> getBomList() { + return bomList; + } + + public void setBomList(List> bomList) { + this.bomList = bomList; + } + public String getFixture() { return fixture; } diff --git a/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java b/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java index f38c284..93c850a 100644 --- a/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java +++ b/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java @@ -202,6 +202,18 @@ public interface ScheduleMapper { **/ List getOrderBomByCon(SearchScheduleData inData); + /** + * 更新工单BOM备注 + * @param site 工厂 + * @param orderNo 工单号 + * @param itemNo 序号 + * @param remark 备注 + */ + void updateOrderBomRemark(@Param("site") String site, + @Param("orderNo") String orderNo, + @Param("itemNo") Integer itemNo, + @Param("remark") String remark); + /** * TODO 查询派工单的材料记录数据 * @author LR diff --git a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java index 633eac3..e3a429a 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java +++ b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java @@ -203,6 +203,14 @@ public interface ScheduleService { **/ List getOrderBomByCon(SearchScheduleData inData); + /** + * 更新工单BOM备注 + * @param site 工厂 + * @param orderNo 工单号 + * @param bomList BOM列表 + */ + void updateOrderBomRemark(String site, String orderNo, List> bomList); + /** * TODO 查询派工单材料上机的数据 * diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java index 2b3c966..06f71d1 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java @@ -294,6 +294,19 @@ public class ScheduleServiceImpl implements ScheduleService { return scheduleMapper.getOrderBomByCon(inData); } + @Override + public void updateOrderBomRemark(String site, String orderNo, List> bomList) { + if (bomList != null && !bomList.isEmpty()) { + for (Map item : bomList) { + Integer itemNo = item.get("itemNo") != null ? Integer.valueOf(item.get("itemNo").toString()) : null; + String remark = item.get("remark") != null ? item.get("remark").toString() : ""; + if (itemNo != null) { + scheduleMapper.updateOrderBomRemark(site, orderNo, itemNo, remark); + } + } + } + } + @Override public List getSfdcMaterialByCon(SearchScheduleData inData) { //判断是否查询当前卷的 @@ -2817,6 +2830,17 @@ public class ScheduleServiceImpl implements ScheduleService { if (inData.getRemark() != null && !inData.getRemark().trim().isEmpty()) { scheduleMapper.updateSOScheduledRoutingRemark(inData); } + //4.6 更新材料清单的备注信息 + List> bomList = inData.getBomList(); + if (bomList != null && !bomList.isEmpty()) { + for (Map item : bomList) { + Integer bomItemNo = item.get("itemNo") != null ? Integer.valueOf(item.get("itemNo").toString()) : null; + String bomRemark = item.get("remark") != null ? item.get("remark").toString() : ""; + if (bomItemNo != null) { + scheduleMapper.updateOrderBomRemark(site, orderNo, bomItemNo, bomRemark); + } + } + } //5.调用存储过程处理 transHeader TransDetail TransDetailSub数据 this.finishScheduleProcessTransData(site, orderNo, itemNo, seqNo, username, operatorName, reportedTime); //6.调用存储过程 处理异常信息 diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index e046d06..d714245 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -790,6 +790,15 @@ ORDER BY vss.ItemNo ASC + + + UPDATE SOBOM + SET Remark = #{remark} + WHERE Site = #{site} + AND OrderNo = #{orderNo} + AND ItemNo = #{itemNo} + +