From 6ad5ed5fddb9ec3109390275ddc12e4d1cb70cff Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 22 May 2024 11:54:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E5=8D=87=E7=BA=A7+?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=89=B9=E6=AC=A1=E5=88=A0=E9=99=A4=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MesPrepareDetailController.java | 14 +++- .../controller/MesReportWorkController.java | 7 ++ .../java/com/op/mes/domain/MesPrepare.java | 10 ++- .../com/op/mes/domain/MesPrepareDetail.java | 19 ++++- .../op/mes/mapper/MesPrepareDetailMapper.java | 6 +- .../op/mes/mapper/MesReportWorkMapper.java | 5 ++ .../mes/service/IMesPrepareDetailService.java | 4 +- .../op/mes/service/IMesReportWorkService.java | 2 + .../impl/MesPrepareDetailServiceImpl.java | 30 ++++++- .../impl/MesReportWorkServiceImpl.java | 12 +++ .../mapper/mes/MesPrepareDetailMapper.xml | 30 ++++++- .../mapper/mes/MesReportWorkMapper.xml | 15 +++- .../op/open/service/impl/OpenServiceImpl.java | 2 +- .../impl/ProOrderWorkorderServiceImpl.java | 30 +++---- .../resources/mapper/plan/ProOrderMapper.xml | 1 + .../impl/QcCheckTaskIncomeServiceImpl.java | 82 ++++++++++++------- .../impl/QcCheckTaskProduceServiceImpl.java | 1 + 17 files changed, 208 insertions(+), 62 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesPrepareDetailController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesPrepareDetailController.java index 22968024..b82b0b24 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesPrepareDetailController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesPrepareDetailController.java @@ -40,12 +40,18 @@ public class MesPrepareDetailController extends BaseController { * @return */ @RequiresPermissions("mes:prepareDetail:export") - @Log(title = "mes备料打印", businessType = BusinessType.EXPORT) - @GetMapping("/printPrepareByCode/{workorderCode}") - public AjaxResult printPrepareByCode(@PathVariable("workorderCode") String workorderCode) { - return mesPrepareDetailService.printPrepareByCode(workorderCode); + @Log(title = "mes备料打印生产物料", businessType = BusinessType.EXPORT) + @GetMapping("/printPrepareByCode/{workorderCode}/{recoil}") + public AjaxResult printPrepareByCode(@PathVariable("workorderCode") String workorderCode,@PathVariable("recoil") String recoil) { + return mesPrepareDetailService.printPrepareByCode(workorderCode,recoil); } + @RequiresPermissions("mes:prepareDetail:export") + @Log(title = "mes备料打印某天的反冲物料", businessType = BusinessType.EXPORT) + @GetMapping("/printPrepareXByCode/{productDate}") + public AjaxResult printPrepareXByCode(@PathVariable("productDate") String productDate) { + return mesPrepareDetailService.printPrepareXByCode(productDate); + } /** * 查询mes备料单明细列表 */ diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java index 03531d04..8803c218 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java @@ -533,6 +533,13 @@ public class MesReportWorkController extends BaseController { public AjaxResult deleteBomRowNow(@PathVariable String id) { return toAjax(mesReportWorkService.deleteBomRowNow(id)); } + + /**删除报工数据**/ + @DeleteMapping("/deleteReportNow/{reportCode}") + public AjaxResult deleteReportNow(@PathVariable String reportCode) { + return toAjax(mesReportWorkService.deleteReportNow(reportCode)); + } + //获取仓库下拉列表 @GetMapping("/getWarehouseList") public List getWarehouseList(MesReportWorkConsume workConsume) { diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepare.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepare.java index c2e9db33..d64aaf86 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepare.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepare.java @@ -173,9 +173,17 @@ public class MesPrepare extends BaseEntity { */ @Excel(name = "工厂编码") private String factoryCode; - + private String prodLineCode; private String dayStr; + public String getProdLineCode() { + return prodLineCode; + } + + public void setProdLineCode(String prodLineCode) { + this.prodLineCode = prodLineCode; + } + public String getWorkorderCodeSap() { return workorderCodeSap; } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepareDetail.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepareDetail.java index 932242f7..d1754627 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepareDetail.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepareDetail.java @@ -66,7 +66,7 @@ public class MesPrepareDetail extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "工单生产日期", width = 30, dateFormat = "yyyy-MM-dd") private Date productDate; - + private String productDateStr; /** * 班次 */ @@ -118,6 +118,23 @@ public class MesPrepareDetail extends BaseEntity { private String buyFlag; private String workorderCode; private String parentOrder; + private String prodLineCode; + + public String getProductDateStr() { + return productDateStr; + } + + public void setProductDateStr(String productDateStr) { + this.productDateStr = productDateStr; + } + + public String getProdLineCode() { + return prodLineCode; + } + + public void setProdLineCode(String prodLineCode) { + this.prodLineCode = prodLineCode; + } public String getParentOrder() { return parentOrder; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesPrepareDetailMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesPrepareDetailMapper.java index c1bf16f4..22a64a4f 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesPrepareDetailMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesPrepareDetailMapper.java @@ -68,8 +68,10 @@ public interface MesPrepareDetailMapper { /** * 通过主领料单id查询领料详情list * - * @param workorderCode + * @param dto * @return */ - List selectPrintPrepareDetailList(String workorderCode); + List selectPrintPrepareDetailList(MesPrepareDetail dto); + + List selectPreDetailHzList(MesPrepareDetail qodetail); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java index 2e9ea33c..09e9bdcc 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java @@ -157,4 +157,9 @@ public interface MesReportWorkMapper { List getProductProData(MesReportWork dto); List getMachineProductionList(MesMachineReport mesMachineReport); + + String getUploadStatusByReportCode(String reportCode); + + int deleteReport(String reportCode); + int deleteReportConsume(String reportCode); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesPrepareDetailService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesPrepareDetailService.java index f732b88b..09807e52 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesPrepareDetailService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesPrepareDetailService.java @@ -65,5 +65,7 @@ public interface IMesPrepareDetailService { * * @return */ - AjaxResult printPrepareByCode(String workorderCode); + AjaxResult printPrepareByCode(String workorderCode,String recoil); + + AjaxResult printPrepareXByCode(String productDate); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java index d7ec54e8..c8a52065 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java @@ -127,4 +127,6 @@ public interface IMesReportWorkService { LineChartDto getMonthProData(MesReportProduction mesReportProduction); List getMachineProductionTitle(MesMachineReport mesMachineReport); + + int deleteReportNow(String reportCode); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareDetailServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareDetailServiceImpl.java index 0a316968..99828f87 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareDetailServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareDetailServiceImpl.java @@ -102,9 +102,35 @@ public class MesPrepareDetailServiceImpl implements IMesPrepareDetailService { */ @Override @DS("#header.poolName") - public AjaxResult printPrepareByCode(String workorderCode) { + public AjaxResult printPrepareByCode(String workorderCode,String recoil) { MesPrepare mesPrepare = mesPrepareMapper.selectMesPrepareByCode(workorderCode); - List mesPrepareDetailList = mesPrepareDetailMapper.selectPrintPrepareDetailList(workorderCode); + MesPrepareDetail qodetail = new MesPrepareDetail(); + qodetail.setWorkorderCode(workorderCode); + qodetail.setRecoil("0".equals(recoil)?"":recoil); + List mesPrepareDetailList = mesPrepareDetailMapper.selectPrintPrepareDetailList(qodetail); + mesPrepare.setProdLineCode(mesPrepareDetailList.get(0).getProdLineCode().split(",")[1] + .replace("\"","") + .replace("\"","") + .replace("]]","")); + PrintPrepareVo printPrepareVo = new PrintPrepareVo(); + printPrepareVo.setMesPrepare(mesPrepare); + printPrepareVo.setMesPrepareDetailList(mesPrepareDetailList); + return AjaxResult.success(printPrepareVo); + } + + /** + * 通过日期打印反冲物料的备料单 + * + * @return + */ + @Override + @DS("#header.poolName") + public AjaxResult printPrepareXByCode(String productDate) { + MesPrepare mesPrepare = new MesPrepare(); + MesPrepareDetail qodetail = new MesPrepareDetail(); + qodetail.setProductDateStr(productDate); + qodetail.setRecoil("X"); + List mesPrepareDetailList = mesPrepareDetailMapper.selectPreDetailHzList(qodetail); PrintPrepareVo printPrepareVo = new PrintPrepareVo(); printPrepareVo.setMesPrepare(mesPrepare); printPrepareVo.setMesPrepareDetailList(mesPrepareDetailList); diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java index eb893d50..b0279ef1 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -576,6 +576,18 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { return dynamicColumn; } + @Override + @DS("#header.poolName") + public int deleteReportNow(String reportCode) { + String uploadStatus = mesReportWorkMapper.getUploadStatusByReportCode(reportCode); + if("1".equals(uploadStatus)){ + return 0; + } + int reportNum = mesReportWorkMapper.deleteReport(reportCode); + int consumeNum = mesReportWorkMapper.deleteReportConsume(reportCode); + return reportNum; + } + @Override @DS("#header.poolName") public List> getMachineProductionList(MesMachineReport mesMachineReport) { diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml index b451787b..ae78454a 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml @@ -65,7 +65,8 @@ where record_id = #{recordId} - select mp.workorder_name workorderCode, mpd.material_code materialCode, @@ -76,13 +77,34 @@ mpd.fund_quanlity fundQuanlity, mpd.factory_code factoryCode, mpd.recoil, - ow.product_date productDate + ow.product_date productDate, + ow.prod_line_code prodLineCode from pro_order_workorder ow - left join mes_prepare mp on ow.workorder_code = mp.workorder_code - left join mes_prepare_detail mpd on mp.prepare_id = mpd.prepare_id + left join mes_prepare mp on ow.workorder_code = mp.workorder_code + left join mes_prepare_detail mpd on mp.prepare_id = mpd.prepare_id where ow.belong_work_order = #{workorderCode} + and mpd.recoil = #{recoil} and mp.del_flag = '0' and mpd.del_flag = '0' order by mpd.recoil + insert into mes_prepare_detail diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index b06517c6..f16ff3f4 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -563,7 +563,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mrw.use_man useMan, mrw.create_time createTime, pow.workorder_code_sap workorderCodeSap, - mrw.remark,mrw.report_code reportCode + mrw.remark,mrw.report_code reportCode, + mrw.machine_code machineCode from mes_report_work mrw left join pro_order_workorder pow on mrw.workorder_code = pow.workorder_code where mrw.del_flag='0' and pow.del_flag = '0' @@ -782,9 +783,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pow.product_code, pow.product_name + - - + insert into mes_report_work id, @@ -999,4 +1002,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" set del_flag = '1' where record_id = #{id} + + update mes_report_work set del_flag = '1' where report_code = #{reportCode} + + + update mes_report_work_consume set del_flag = '1' where report_code = #{reportCode} + diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index 29811b5b..3f1357c2 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -392,7 +392,7 @@ public class OpenServiceImpl implements OpenService { qcCheckTaskProduce.setFactoryCode(factoryCode); qcCheckTaskProduce.setCreateTime(nowDate); qcCheckTaskProduce.setTypeCode("produce");//大检验节点 - qcCheckTaskProduce.setIncomeTime(qcCheckTaskProduce.getProduceDate()); + qcCheckTaskProduce.setIncomeTime(DateUtils.getNowDate()); qcCheckTaskProduce.setSupplierCode(qcCheckTaskProduce.getCarCode()); qcCheckTaskProduce.setSupplierName(qcCheckTaskProduce.getCarName()); qcCheckTaskProduce.setCheckManName(null); diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index bf3f8750..5eb59c91 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -826,13 +826,13 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { BigDecimal newSapQuantityNum = new BigDecimal(proOrder.getQuantity()) .subtract(new BigDecimal(proOrder.getAtrr1())); sapChange.setQuantity(newSapQuantityNum.toString());//母订单新数量 - logger.info("母订单" + proOrder.getOrderCode() + - "订单数量变更：修改前" + proOrder.getQuantity() + "," + - "已拆数量" + proOrder.getAtrr1() + "," + - "给sap汇报数量" + newSapQuantityNum.toString()); - R rSapChange = remoteSapService.shopUpdateSync(sapChange);//sap只能同步指定日期的数据 - logger.info("母订单" + proOrder.getOrderCode() + - "订单数量变更结果：" + rSapChange.getCode() + "," + rSapChange.getMsg()); +// logger.info("母订单" + proOrder.getOrderCode() + +// "订单数量变更：修改前" + proOrder.getQuantity() + "," + +// "已拆数量" + proOrder.getAtrr1() + "," + +// "给sap汇报数量" + newSapQuantityNum.toString()); +// R rSapChange = remoteSapService.shopUpdateSync(sapChange);//sap只能同步指定日期的数据 +// logger.info("母订单" + proOrder.getOrderCode() + +// "订单数量变更结果：" + rSapChange.getCode() + "," + rSapChange.getMsg()); } // 获得对应工单----------------------------------------------------------------------------？ @@ -1015,13 +1015,13 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { BigDecimal newSapQuantityNum = new BigDecimal(proOrder.getQuantity()) .subtract(new BigDecimal(proOrder.getAtrr1())); sapChange.setQuantity(newSapQuantityNum.toString());//母订单新数量 - logger.info("母订单" + proOrder.getOrderCode() + - "订单数量变更：修改前" + proOrder.getQuantity() + "," + - "已拆数量" + proOrder.getAtrr1() + "," + - "给sap汇报数量" + newSapQuantityNum.toString()); - R rSapChange = remoteSapService.shopUpdateSync(sapChange);//sap只能同步指定日期的数据 - logger.info("母订单" + proOrder.getOrderCode() + - "订单数量变更结果：" + rSapChange.getCode() + "," + rSapChange.getMsg()); +// logger.info("母订单" + proOrder.getOrderCode() + +// "订单数量变更：修改前" + proOrder.getQuantity() + "," + +// "已拆数量" + proOrder.getAtrr1() + "," + +// "给sap汇报数量" + newSapQuantityNum.toString()); +// R rSapChange = remoteSapService.shopUpdateSync(sapChange);//sap只能同步指定日期的数据 +// logger.info("母订单" + proOrder.getOrderCode() + +// "订单数量变更结果：" + rSapChange.getCode() + "," + rSapChange.getMsg()); } // 获得对应工单----------------------------------------------------------------------------？ @@ -1144,7 +1144,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { public AjaxResult checkWorkOrder(String id) { ProOrderWorkorder proOrderWorkorder = proOrderWorkorderMapper.selectProOrderWorkorderByWorkorderId(id); if (!(proOrderWorkorder.getStatus().equals("w0") || proOrderWorkorder.getStatus().equals("w1"))) { - return error("工单已生产，不可变更！"); + return error("工单只有未派发和已派发才可变更！"); } return success(); } diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml index 679f9847..37b06efd 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml @@ -126,6 +126,7 @@ LEFT JOIN pro_order_workorder pow ON powb.workorder_id = pow.workorder_id WHERE pow.workorder_id = #{workorderId} and powb.del_flag = '0' + order by powb.batch_code