From ca51dbda0ca9550f8d79e7b6b16eb53e08149949 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 27 Mar 2024 15:20:50 +0800 Subject: [PATCH 01/13] =?UTF-8?q?2024-3-27=20=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-=E8=AE=BE=E5=A4=87-=E5=8E=BB=E6=8E=89=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=90=8D=E7=A7=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/controller/BaseEquipmentController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java index e39cbc74a..6bc925aae 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java @@ -95,9 +95,7 @@ public class BaseEquipmentController extends BaseController { public AjaxResult add(@RequestBody BaseEquipment baseEquipment) { if (baseEquipmentService.checkEquipmentCodeUnique(baseEquipment)) { return AjaxResult.error("设备编码已存在！"); - } else if (baseEquipmentService.checkEquipmentNameUnique(baseEquipment)) { - return AjaxResult.error("设备名称已存在！"); - } else { + }else{ return toAjax(baseEquipmentService.insertBaseEquipment(baseEquipment)); } } From fb85f305b9d0749236b3c86e99fcff0b95008736 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 27 Mar 2024 15:34:07 +0800 Subject: [PATCH 02/13] =?UTF-8?q?qc=20bug=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/mes/controller/MesBoardController.java | 28 ++++-- .../main/java/com/op/mes/domain/MesBoard.java | 18 ++++ .../java/com/op/mes/mapper/MesMapper.java | 7 ++ .../com/op/mes/service/IMesBoradService.java | 6 ++ .../mes/service/impl/MesBoradServiceImpl.java | 90 ++++++++++++++++++- .../main/resources/mapper/mes/MesMapper.xml | 19 ++++ .../controller/QcInterfaceController.java | 1 + .../com/op/quality/domain/QcInterface.java | 9 ++ .../quality/service/IQcInterfaceService.java | 1 + .../impl/QcCheckTaskIncomeServiceImpl.java | 6 +- 10 files changed, 175 insertions(+), 10 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java index e3cb8f10d..513119735 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java @@ -1,19 +1,21 @@ package com.op.mes.controller; +import com.op.common.core.utils.StringUtils; +import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.domain.AjaxResult; +import com.op.mes.domain.MesBoard; import com.op.mes.service.IMesBoradService; import com.op.system.api.domain.dto.BoardDTO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; @RestController @RequestMapping("/mesborad") -public class MesBoardController { +public class MesBoardController extends BaseController { @Autowired private IMesBoradService iMesBoradService; @@ -25,5 +27,21 @@ public class MesBoardController { public AjaxResult finishProductBoard(@RequestBody BoardDTO boardDTO) { return iMesBoradService.finishProductBoard(boardDTO); } + /******************************自动化产线方案看板****************************************/ + /**根据工厂获取产线**/ + @GetMapping("/getLineList") + public List getLineList(BoardDTO mesBoard) { + return iMesBoradService.getLineList(mesBoard); + } + @PostMapping("/getProduction15Days") + public AjaxResult getProduction15Days(BoardDTO mesBoard) { + if (StringUtils.isBlank(mesBoard.getFactoryCode())) { + return error("[facotryCode] 不能为空"); + } + if (StringUtils.isBlank(mesBoard.getEquCode())) { + return error("[equCode] 不能为空"); + } + return success(iMesBoradService.getProduction15Days(mesBoard)); + } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesBoard.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesBoard.java index 39748bb2a..135ad8c65 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesBoard.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesBoard.java @@ -19,6 +19,24 @@ public class MesBoard { private List files; private String workshopCode; private String workshopName; + private String lineCode; + private String lineName; + + public String getLineCode() { + return lineCode; + } + + public void setLineCode(String lineCode) { + this.lineCode = lineCode; + } + + public String getLineName() { + return lineName; + } + + public void setLineName(String lineName) { + this.lineName = lineName; + } public String getWorkshopCode() { return workshopCode; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java index d3a0049ed..3377fceb9 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java @@ -2,6 +2,7 @@ package com.op.mes.mapper; import com.op.common.core.domain.BaseFileData; import com.op.mes.domain.MesBoard; +import com.op.mes.domain.MesReportWork; import com.op.mes.domain.dto.BaseEquipmentDto; import com.op.mes.domain.dto.LGInfoDto; import com.op.system.api.domain.SysDept; @@ -9,6 +10,7 @@ import com.op.system.api.domain.SysSapLog; import com.op.system.api.domain.dto.BoardDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.dto.WCSDataItemsDTO; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -72,4 +74,9 @@ public interface MesMapper { List> daySenvenProduction(); List> ProductionInProgress(); + + List getLineList(BoardDTO boardDTO); + + @MapKey("dayStr") + Map getProduction15Days(BoardDTO boardDTO); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesBoradService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesBoradService.java index dc5ea48c3..175b7cc2e 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesBoradService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesBoradService.java @@ -3,6 +3,12 @@ package com.op.mes.service; import com.op.common.core.web.domain.AjaxResult; import com.op.system.api.domain.dto.BoardDTO; +import java.util.List; + public interface IMesBoradService { public AjaxResult finishProductBoard(BoardDTO boardDTO); + + public List getLineList(BoardDTO boardDTO); + + public BoardDTO getProduction15Days(BoardDTO mesBoard); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java index 1be43cb68..e09a7e99e 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java @@ -1,17 +1,19 @@ package com.op.mes.service.impl; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; +import com.op.common.core.utils.DateUtils; import com.op.common.core.web.domain.AjaxResult; +import com.op.mes.domain.MesReportWork; import com.op.mes.mapper.MesMapper; import com.op.mes.service.IMesBoradService; import com.op.system.api.domain.dto.BoardDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.text.SimpleDateFormat; +import java.util.*; @Service public class MesBoradServiceImpl implements IMesBoradService { @@ -34,4 +36,86 @@ public class MesBoradServiceImpl implements IMesBoradService { map.put("ProductionInProgress", ProductionInProgress); return AjaxResult.success(map); } + + @Override + public List getLineList(BoardDTO boardDTO) { + DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode()); + boardDTO.setEquipmentTypeCode("equ_type_bzx"); + List lineList = mesMapper.getLineList(boardDTO); + return lineList; + } + + @Override + public BoardDTO getProduction15Days(BoardDTO boardDTO) { + DynamicDataSourceContextHolder.push(boardDTO.getFactoryCode()); + BoardDTO dto = new BoardDTO(); + + String nowDate = DateUtils.getDate(); + + List days = this.getDays(15); + //days + dto.setDays(days); + boardDTO.setStartTime(days.get(0)); + boardDTO.setEndTime(days.get(days.size()-1)); + Map pros15 = mesMapper.getProduction15Days(boardDTO); + MesReportWork todaydto = pros15.get(nowDate); + if(todaydto != null){ + dto.setPlanProduction(todaydto.getQuantity().toString().replace(".00","")); + dto.setActProduction(todaydto.getQuantityFeedback().toString()); + }else{ + dto.setPlanProduction("0"); + dto.setActProduction("0"); + } + //plans; + List plans = new ArrayList<>(); + List acts = new ArrayList<>(); + //acts; + for(String dayStr:days){ + MesReportWork workR = pros15.get(dayStr); + if(workR != null){ + plans.add(workR.getQuantity().toString()); + acts.add(workR.getQuantityFeedback().toString()); + }else{ + plans.add("0"); + acts.add("0"); + } + } + dto.setPlans(plans); + dto.setActs(acts); + return dto; + } + + //获取当前日期前几天 + private List getDays(int dayNum){ + List days = new ArrayList<>(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + Calendar cal = Calendar.getInstance(); + //获取前面的时间用-负号 + Date date = new Date(); + for(int num=0;num days = new ArrayList<>(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + Calendar cal = Calendar.getInstance(); + //获取前面的时间用-负号 + Date date = new Date(); + for(int num=0;num<15;num++){ + cal.setTime(date); + cal.add(Calendar.DAY_OF_MONTH, -num); + days.add(sdf.format(cal.getTime())); + } + Collections.reverse(days); + + System.out.println(JSONObject.toJSONString(days)); + } } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml index f5124317d..56844260f 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml @@ -286,4 +286,23 @@ A.unit, C.equipment_name; + + + diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcInterfaceController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcInterfaceController.java index cc974f126..0a7b00e23 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcInterfaceController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcInterfaceController.java @@ -1,5 +1,6 @@ package com.op.quality.controller; +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.utils.StringUtils; import com.op.quality.domain.QcCheckType; import com.op.quality.domain.QcInterface; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcInterface.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcInterface.java index e838e645f..908cfe8f1 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcInterface.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcInterface.java @@ -52,6 +52,15 @@ public class QcInterface extends BaseEntity { private String nameDate; private List dataBarArrays; private List dataLineArrays; + private String equipmentTypeCode; + + public String getEquipmentTypeCode() { + return equipmentTypeCode; + } + + public void setEquipmentTypeCode(String equipmentTypeCode) { + this.equipmentTypeCode = equipmentTypeCode; + } public List getDataBarArrays() { return dataBarArrays; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcInterfaceService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcInterfaceService.java index 72b53a3e6..ddf9d41ce 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcInterfaceService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcInterfaceService.java @@ -37,4 +37,5 @@ public interface IQcInterfaceService { List getMonthOfYearContrast(QcInterface qcInterface); QcLineChartDto getLineQcData(QcInterface qcInterface); + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index e88e90186..008c4aa4e 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -667,8 +667,10 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { } } } - n= qcCheckTaskIncomeMapper.addQcCheckTaskDefects(defects); - logger.info("qc_check_task_defect:"+n); + if(!CollectionUtils.isEmpty(defects)){ + n= qcCheckTaskIncomeMapper.addQcCheckTaskDefects(defects); + logger.info("qc_check_task_defect:"+n); + } if("material".equals(qcCheckTaskIncome.getTypeCode())){ qcCheckTaskIncome.setCheckResult(result.equals("Y")?"1":"2"); From abd0d6a62ef8d3b2655d9b1ea7400327b9982dbb Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 27 Mar 2024 15:35:38 +0800 Subject: [PATCH 03/13] =?UTF-8?q?qc=20bug=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/system/api/domain/dto/BoardDTO.java | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java index 85bb73cd3..98af79956 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java @@ -11,6 +11,87 @@ public class BoardDTO { private String equTypeCode; private String equTypeName; private String shiftId; + private String factoryCode; + private String equipmentTypeCode; + private String planProduction; + private String actProduction; + private List plans; + private List acts; + private List days; + private String startTime; + private String endTime; + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public List getDays() { + return days; + } + + public void setDays(List days) { + this.days = days; + } + + public String getPlanProduction() { + return planProduction; + } + + public void setPlanProduction(String planProduction) { + this.planProduction = planProduction; + } + + public String getActProduction() { + return actProduction; + } + + public void setActProduction(String actProduction) { + this.actProduction = actProduction; + } + + public List getPlans() { + return plans; + } + + public void setPlans(List plans) { + this.plans = plans; + } + + public List getActs() { + return acts; + } + + public void setActs(List acts) { + this.acts = acts; + } + + public String getEquipmentTypeCode() { + return equipmentTypeCode; + } + + public void setEquipmentTypeCode(String equipmentTypeCode) { + this.equipmentTypeCode = equipmentTypeCode; + } + + public String getFactoryCode() { + return factoryCode; + } + + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } public String getShiftId() { return shiftId; From b0c2ef28cfba2066919151167f8822b80007518e Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 27 Mar 2024 16:35:39 +0800 Subject: [PATCH 04/13] =?UTF-8?q?qc=20bug=E4=BF=AE=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/op/open/service/impl/OpenServiceImpl.java | 2 +- .../op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 52b75d54d..f4e5a02ae 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 @@ -379,7 +379,7 @@ public class OpenServiceImpl implements OpenService { QcMaterialGroupDetailDTO group = openMapper.getGroupByMaterial(qcCheckTaskProduce.getMaterialCode()); if (group == null) { group = new QcMaterialGroupDetailDTO(); - group.setGroupId("3dc0655fea3449c59c76a01cc5b91565"); + group.setGroupId("3dc0655fea3449c59c76a01cc5b91565");//成品蚊香物料组 } qctp.setGroupId(group.getGroupId());//共性 List itemsGG = openMapper.getTPByTypeGroup(qctp); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 008c4aa4e..4aa0e757a 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -722,7 +722,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { n = qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified); logger.info("qc_check_unqualified:" + n); } - return n ; + return 1 ; } @Override From 14c21142a5f24e9e35f697990f38385e851a80eb Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Wed, 27 Mar 2024 18:02:50 +0800 Subject: [PATCH 05/13] =?UTF-8?q?wms=E5=8C=85=E6=9D=90=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B922?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/wms/WmsProductPutMapper.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml index b69649d52..3b3be85ec 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml @@ -48,7 +48,8 @@ + SELECT + wms_ruturn_put_embryo.id , + wms_ruturn_put_embryo.factory_code As factoryCode, + wms_ruturn_put_embryo.product_order As productOrder , + wms_ruturn_put_embryo.wh_code As whCode, + wms_ruturn_put_embryo.wa_code As waCode, + wms_ruturn_put_embryo.wl_code As wlCode, + wms_ruturn_put_embryo.product_name As productName, + wms_ruturn_put_embryo.product_code As productCode, + wms_ruturn_put_embryo.product_sort As productSort, + wms_ruturn_put_embryo.specification As speciFication, + wms_ruturn_put_embryo.unit_of_measure As unitOfMeasure, + wms_ruturn_put_embryo.plan_quantity As planQuantity, + COALESCE(wms_ruturn_put_embryo.put_quantity, 0) AS putQuantity, + wms_ruturn_put_embryo.status As status, + wms_ruturn_put_embryo.SAP_status As sapStatus, + wms_ruturn_put_embryo.SAP_proof As sapProof, + wms_ruturn_put_embryo.SAP_message As sapMessage, + wms_ruturn_put_embryo.put_date As putDate, + wms_ruturn_put_embryo.attr1 , + wms_ruturn_put_embryo.attr2 , + wms_ruturn_put_embryo.attr3 , + wms_ruturn_put_embryo.attr4 , + wms_ruturn_put_embryo.attr5 , + wms_ruturn_put_embryo.attr6 , + wms_ruturn_put_embryo.attr7, + wms_ruturn_put_embryo.attr8, + wms_ruturn_put_embryo.attr9, + wms_ruturn_put_embryo.attr10, + wms_ruturn_put_embryo.create_by As createBy, + wms_ruturn_put_embryo.create_time As createTime, + wms_ruturn_put_embryo.update_by As updateBy, + wms_ruturn_put_embryo.update_time As updateTime + FROM + wms_ruturn_put_embryo + where + active_flag='1' and product_order=#{productOrder} + + + + update wms_ruturn_put_embryo + + wh_code = #{whCode}, + wa_code = #{waCode}, + wl_code = #{wlCode}, + product_order = #{productOrder}, + product_code = #{productCode}, + product_name = #{productName}, + plan_quantity = #{planQuantity}, + put_quantity = #{putQuantity}, + status = #{status}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + attr5 = #{attr5}, + attr6 = #{attr6}, + attr7 = #{attr7}, + attr8 = #{attr8}, + attr9 = #{attr9}, + attr10 = #{attr10}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + factory_code = #{factoryCode}, + + where id=#{id} + + + insert into wms_ruturn_put_embryo_record + + id, + factory_code, + product_order, + wh_code, + wa_code, + wl_code, + product_name, + product_code, + product_sort, + specification, + unit_of_measure, + plan_quantity, + put_quantity, + status, + SAP_status, + SAP_proof, + SAP_message, + put_date, + attr1, + attr2, + attr3, + attr4, + attr5, + attr6, + attr7, + attr8, + attr9, + attr10, + create_by, + create_time, + update_by, + update_time, + active_flag, + + + #{id}, + #{factoryCode}, + #{productOrder}, + #{whCode}, + #{waCode}, + #{wlCode}, + #{productName}, + #{productCode}, + #{productSort}, + #{specification}, + #{unitOfMeasure}, + #{planQuantity}, + #{putQuantity}, + #{status}, + #{SAPStatus}, + #{SAPProof}, + #{SAPMessage}, + #{putDate}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{attr5}, + #{attr6}, + #{attr7}, + #{attr8}, + #{attr9}, + #{attr10}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{activeFlag}, + + + From 1af3940012f70eb6cc6a5f057a2ac0f96476afe0 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 28 Mar 2024 14:05:48 +0800 Subject: [PATCH 09/13] =?UTF-8?q?wms=E6=88=90=E5=93=81=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B925?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/wms/service/impl/WmsProductPutServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index 4dc5f959f..d0d5c5bdb 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -811,12 +811,12 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { WmsRuturnPutEmbryo wmsRuturnPutEmbryo2= wmsRuturnPutEmbryoMapper.selectWmsRuturnPutEmbryoByid(wmsRuturnPutEmbryo1); BigDecimal allTem= wmsRuturnPutEmbryo2.getPlanQuantity(); BigDecimal putTem= wmsRuturnPutEmbryo2.getPutQuantity(); - BigDecimal putQuantity= putTem.add(new BigDecimal(wmsProductPutList.size())); - int result = putQuantity.compareTo(allTem); + //BigDecimal putQuantity= putTem.add(new BigDecimal(wmsRuturnPutEmbryo.get())); + int result = wmsRuturnPutEmbryo.getPutQuantity().compareTo(allTem); if (result == 0) { wmsRuturnPutEmbryo2.setStatus("1");//0是未完成，1是完成 } - wmsRuturnPutEmbryo2.setPutQuantity(putQuantity); + wmsRuturnPutEmbryo2.setPutQuantity(wmsRuturnPutEmbryo.getPutQuantity()); wmsRuturnPutEmbryo2.setUpdateBy(wmsRuturnPutEmbryo.getCreateBy()); wmsRuturnPutEmbryo2.setUpdateTime(new Date()); wmsRuturnPutEmbryoMapper.updateWmsRuturnPutEmbryo(wmsRuturnPutEmbryo2); From 3486c0046115ca47a030954a507f72ce9937ce52 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 28 Mar 2024 14:17:09 +0800 Subject: [PATCH 10/13] =?UTF-8?q?qc=5Fcheck=5Ftask=5Fdefect=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=B7=BB=E5=8A=A0=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/QcCheckTaskIncomeServiceImpl.java | 2 +- .../impl/QcCheckTaskInventoryServiceImpl.java | 2 +- .../impl/QcCheckTaskMarketServiceImpl.java | 2 +- .../impl/QcCheckTaskProduceServiceImpl.java | 2 +- .../QcCheckTaskWarehousingServiceImpl.java | 2 +- .../quality/QcCheckTaskDefectMapper.xml | 33 ++++++++++--------- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 4aa0e757a..e9e93f60c 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -240,7 +240,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { if (!CollectionUtils.isEmpty(defectList)) { for (QcCheckTaskDefect defect : defectList) { defect.setBelongTo(beLongId); - qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + //qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality()); } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java index 936301373..d85479b73 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java @@ -183,7 +183,7 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer if (!CollectionUtils.isEmpty(defectList)) { for (QcCheckTaskDefect defect : defectList) { defect.setBelongTo(beLongId); - qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + //qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); noOkQuality = noOkQuality.add(defect.getNoOkQuality() == null ? new BigDecimal("0") : defect.getNoOkQuality()); } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskMarketServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskMarketServiceImpl.java index bad68a894..cc823457e 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskMarketServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskMarketServiceImpl.java @@ -181,7 +181,7 @@ public class QcCheckTaskMarketServiceImpl implements IQcCheckTaskMarketService { if (!CollectionUtils.isEmpty(defectList)) { for (QcCheckTaskDefect defect : defectList) { defect.setBelongTo(beLongId); - qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + //qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); noOkQuality = noOkQuality.add(defect.getNoOkQuality() == null ? new BigDecimal("0") : defect.getNoOkQuality()); } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java index ee0810c1c..4b71a0dc2 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java @@ -226,7 +226,7 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService if (!CollectionUtils.isEmpty(defectList)) { for (QcCheckTaskDefect defect : defectList) { defect.setBelongTo(beLongId); - qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + //qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality()); } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java index cd6b65785..0d5d4cbbd 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java @@ -205,7 +205,7 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin if (!CollectionUtils.isEmpty(defectList)) { for (QcCheckTaskDefect defect : defectList) { defect.setBelongTo(beLongId); - qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); + //qcCheckTaskDefectService.insertQcCheckTaskDefect(defect); noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality()); } } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml index e1b129080..87176d37b 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml @@ -132,7 +132,7 @@ From edb80d785a261fb4e1257c867d9d9bf6cbbf6f60 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 28 Mar 2024 14:17:23 +0800 Subject: [PATCH 11/13] =?UTF-8?q?qc=5Fcheck=5Ftask=5Fdefect=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=B7=BB=E5=8A=A0=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/service/impl/QcCheckReportProduceServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java index ce3e22e3e..7bceff9d0 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java @@ -273,7 +273,7 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer /**qc_check_task**/ int n = qcCheckReportIncomeMapper.submitConfirm(qcCheckReportIncome); logger.info("qc_check_task：【二次确认】" + qcCheckReportIncome.getCheckType() + ":" + n); - return n; + return 1; } return 0; } From b0c711c443ffe8abdbea51406bfc5dbcf5e7510d Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 28 Mar 2024 15:37:07 +0800 Subject: [PATCH 12/13] =?UTF-8?q?wms=E6=88=90=E5=93=81=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B926?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/WmsToWCSmissionController.java | 4 ++-- .../com/op/wms/domain/WmsAllocationOutEmbryo.java | 15 +++++++++++++++ .../com/op/wms/service/IWmsProductPutService.java | 3 +++ .../service/impl/WmsProductPutServiceImpl.java | 7 +++++++ 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/domain/WmsAllocationOutEmbryo.java diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index 574fdb06d..fff8eab10 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java @@ -334,8 +334,8 @@ public class WmsToWCSmissionController { * */ @PostMapping("/selectFinishedProductTransferAndOutbound") - public AjaxResult selectFinishedProductTransferAndOutbound(@RequestBody WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { - return AjaxResult.success(wmsProductPutService.FinishedProductSalesReturnConfirm(wmsRuturnPutEmbryo)); + public AjaxResult selectFinishedProductTransferAndOutbound(@RequestBody WmsAllocationOutEmbryo wmsRuturnPutEmbryo) { + return AjaxResult.success(wmsProductPutService.selectFinishedProductTransferAndOutbound(wmsRuturnPutEmbryo)); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsAllocationOutEmbryo.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsAllocationOutEmbryo.java new file mode 100644 index 000000000..702ce7610 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsAllocationOutEmbryo.java @@ -0,0 +1,15 @@ +package com.op.wms.domain; + +import com.op.common.core.web.domain.BaseEntity; + +/** + * 成品调拨单 + */ +public class WmsAllocationOutEmbryo extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java index e7dafba13..dea2995d6 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java @@ -117,4 +117,7 @@ public interface IWmsProductPutService { * @return */ String FinishedProductSalesReturnConfirm(WmsRuturnPutEmbryo wmsRuturnPutEmbryo); + + + List selectFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsRuturnPutEmbryo); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index d0d5c5bdb..4bcef6a8f 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -883,4 +883,11 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { } return SUCCESS; } + + @Override + public List selectFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsRuturnPutEmbryo) { + + + return null; + } } From bf4b93fe2353c28d0cd5814d8b39ffdeff00edaa Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 28 Mar 2024 16:11:41 +0800 Subject: [PATCH 13/13] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/mes/MesReportWorkConsumeMapper.xml | 1 - .../plan/mapper/ProWetMaterialPlanMapper.java | 9 +++++---- .../impl/ProOrderWorkorderServiceImpl.java | 4 ++++ .../mapper/plan/ProWetMaterialPlanMapper.xml | 19 +++++++++++++++++++ 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml index e15dee819..55379f8b3 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml @@ -52,7 +52,6 @@ and factory_code = #{factoryCode} and recoil = #{recoil} and del_flag = '0' - and quantity != '.00' diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanMapper.java index 96c971f28..c3fed1442 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanMapper.java @@ -4,10 +4,7 @@ import java.util.Date; import java.util.List; import com.op.common.core.web.domain.AjaxResult; -import com.op.plan.domain.BMS; -import com.op.plan.domain.Bucket; -import com.op.plan.domain.ProWetMaterialPlan; -import com.op.plan.domain.Product; +import com.op.plan.domain.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -138,4 +135,8 @@ public interface ProWetMaterialPlanMapper { * @return */ ProWetMaterialPlan selectProWetMaterialPlanByWorkIdN(String workorderId); + + void deletePrepare(@Param("works") List works); + + void deletePrepareBatch(@Param("works") List workers); } 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 522729dad..9c0d18dc8 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 @@ -269,6 +269,10 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { proOrderWorkorderMapper.deleteProOrderWorkorderByWorkorderIds(workorderIds0); //删除批次pro_order_workorder_batch proOrderWorkorderBatchMapper.deleteBatch(workorderIds0); +// //删除mes_prepare +// proWetMaterialPlanMapper.deletePrepare(workers); +// //删除mes_prepare_detail +// proWetMaterialPlanMapper.deletePrepareBatch(workers); } if (!CollectionUtils.isEmpty(workers)) { diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanMapper.xml index 3b42d4498..c23962eb2 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanMapper.xml @@ -204,4 +204,23 @@ #{id} + + update mes_prepare + set del_flag = '1' + where workorder_code in + + #{workorderCode} + + + + update mes_prepare_detail + set del_flag = '1' + where prepare_id in( + select prepare_id from mes_prepare + where workorder_code in + + #{workorderCode} + + ) +