From ff9b1c3cb985fee32ed2680fbef15e3061ce7285 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Tue, 12 Mar 2024 10:22:30 +0800 Subject: [PATCH 01/13] =?UTF-8?q?wms=E7=99=BD=E5=9D=AF=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsToWCSmissionController.java | 22 +++++++++ .../wms/mapper/WmsOdsEmStorageNewsMapper.java | 2 + .../wms/service/IOdsWhiteEmbryoService.java | 10 ++++ .../impl/OdsWhiteEmbryoServiceImpl.java | 49 +++++++++++++++++++ .../mapper/wms/WmsOdsEmStorageNewsMapper.xml | 10 ++++ 5 files changed, 93 insertions(+) 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 46245b83..b571ce8d 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 @@ -301,4 +301,26 @@ public class WmsToWCSmissionController { String result= iOdsWhiteEmbryoService.WhiteWarehouseDump(wmsOdsEmStorageNewsSn); return success(result); } + + + + + @PostMapping("/queryMaterialInfor") + public AjaxResult queryMaterialInfor(@RequestBody WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn) { + // OdsProcureOutOrder orderList = odsProcureOrderService.PurchaseOrderOutboundPda(odsProcureOrder); + WmsOdsEmStorageNews wmsOdsEmStorageNews= iOdsWhiteEmbryoService.queryMaterialInfor(wmsOdsEmStorageNewsSn); + return success(wmsOdsEmStorageNews); + } + /** + * 用于白坯退货确认- + * + * @param wmsOdsEmStorageNewsSn + * @return + */ + @PostMapping("/WhiteBilletReturnConfir") + public AjaxResult WhiteBilletReturnConfir(@RequestBody WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn) { + // OdsProcureOutOrder orderList = odsProcureOrderService.PurchaseOrderOutboundPda(odsProcureOrder); + String result= iOdsWhiteEmbryoService.WhiteBilletReturnConfir(wmsOdsEmStorageNewsSn); + return success(result); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsEmStorageNewsMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsEmStorageNewsMapper.java index ca5e7e87..122cb5b7 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsEmStorageNewsMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsEmStorageNewsMapper.java @@ -63,4 +63,6 @@ public interface WmsOdsEmStorageNewsMapper { void updateAdd(WmsOdsEmStorageNews wmsOdsEmStorageNews); WmsOdsEmStorageNews selectWmsOdsEmStorageNewsByWlCode(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn); + + List selectWmsOdsEmStorageNewsByMaterialCode(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsWhiteEmbryoService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsWhiteEmbryoService.java index 51d311e9..b479ea17 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsWhiteEmbryoService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsWhiteEmbryoService.java @@ -4,6 +4,7 @@ import java.util.List; import com.op.wms.domain.OdsProcureOutOrder; import com.op.wms.domain.OdsWhiteEmbryo; +import com.op.wms.domain.WmsOdsEmStorageNews; import com.op.wms.domain.WmsOdsEmStorageNewsSn; /** @@ -68,4 +69,13 @@ public interface IOdsWhiteEmbryoService { String WhiteEmbryoOutbound(OdsWhiteEmbryo odsWhiteEmbryo); String WhiteWarehouseDump(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn); + + /** + * + * @param wmsOdsEmStorageNewsSn + * @return + */ + String WhiteBilletReturnConfir(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn); + + WmsOdsEmStorageNews queryMaterialInfor(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsWhiteEmbryoServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsWhiteEmbryoServiceImpl.java index 6b023800..e1f84d17 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsWhiteEmbryoServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsWhiteEmbryoServiceImpl.java @@ -265,4 +265,53 @@ public class OdsWhiteEmbryoServiceImpl implements IOdsWhiteEmbryoService { } return result; } + + @Override + public String WhiteBilletReturnConfir(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn) { + //退货的--在生产线上退下来的--托盘号，库位，物料号，物料描述，退货数量 + String result="成功"; + WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn1=new WmsOdsEmStorageNewsSn(); + wmsOdsEmStorageNewsSn1.setAmount(wmsOdsEmStorageNewsSn.getAmount()); + wmsOdsEmStorageNewsSn1.setWlCode(wmsOdsEmStorageNewsSn.getWlCode()); + wmsOdsEmStorageNewsSn1.setMaterialCode(wmsOdsEmStorageNewsSn.getMaterialCode()); + wmsOdsEmStorageNewsSn1.setMaterialDesc(wmsOdsEmStorageNewsSn.getMaterialDesc()); + wmsOdsEmStorageNewsSn1.setSn(wmsOdsEmStorageNewsSn.getSn()); + wmsOdsEmStorageNewsSn1.setCreateBy(wmsOdsEmStorageNewsSn.getCreateBy()); + wmsOdsEmStorageNewsSn1.setGmtCreate(new Date()); + wmsOdsEmStorageNewsSn1.setActiveFlag("1"); + wmsOdsEmStorageNewsSn1.setFactoryCode(wmsOdsEmStorageNewsSn.getFactoryCode()); + wmsOdsEmStorageNewsSnMapper.insertWmsOdsEmStorageNewsSn(wmsOdsEmStorageNewsSn1); + WmsOdsEmStorageNews wmsOdsEmStorageNews1=new WmsOdsEmStorageNews(); + + wmsOdsEmStorageNews1.setWlCode(wmsOdsEmStorageNewsSn.gettOwlCode()); + wmsOdsEmStorageNews1.setMaterialCode(wmsOdsEmStorageNewsSn.getMaterialCode()); + wmsOdsEmStorageNews1.setMaterialDesc(wmsOdsEmStorageNewsSn.getMaterialDesc()); + wmsOdsEmStorageNews1.setUserDefined1(wmsOdsEmStorageNewsSn.getUserDefined1()); + wmsOdsEmStorageNews1.setFactoryCode(wmsOdsEmStorageNewsSn.getFactoryCode()); + wmsOdsEmStorageNews1.setActiveFlag("1"); + List wmsOdsEmStorageNewsList= wmsOdsEmStorageNewsMapper.selectWmsOdsEmStorageNewsList(wmsOdsEmStorageNews1); + if (wmsOdsEmStorageNewsList.size()>0){ + WmsOdsEmStorageNews wmsOdsEmStorageNews2= wmsOdsEmStorageNewsList.get(0); + BigDecimal newAmount= wmsOdsEmStorageNews2.getAmount(); + wmsOdsEmStorageNews2.setAmount(newAmount.add(wmsOdsEmStorageNewsSn.getAmount())); + wmsOdsEmStorageNewsMapper.updateWmsOdsEmStorageNews(wmsOdsEmStorageNews2); + }else { + wmsOdsEmStorageNews1.setStorageId(IdUtils.fastSimpleUUID()); + wmsOdsEmStorageNews1.setCreateBy(wmsOdsEmStorageNewsSn.getCreateBy()); + wmsOdsEmStorageNews1.setGmtCreate(new Date()); + wmsOdsEmStorageNewsMapper.insertWmsOdsEmStorageNews(wmsOdsEmStorageNews1); + } + return result; + } + + @Override + public WmsOdsEmStorageNews queryMaterialInfor(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn) { + DynamicDataSourceContextHolder.push("ds_" + wmsOdsEmStorageNewsSn.getFactoryCode()); + WmsOdsEmStorageNews wmsOdsEmStorageNew=new WmsOdsEmStorageNews(); + List wmsOdsEmStorageNews= wmsOdsEmStorageNewsMapper.selectWmsOdsEmStorageNewsByMaterialCode(wmsOdsEmStorageNewsSn); + if (wmsOdsEmStorageNews.size()>0){ + wmsOdsEmStorageNew=wmsOdsEmStorageNews.get(0); + } + return wmsOdsEmStorageNew; + } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsEmStorageNewsMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsEmStorageNewsMapper.xml index c369e8b5..29c6749c 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsEmStorageNewsMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsEmStorageNewsMapper.xml @@ -222,4 +222,14 @@ WHERE wl_code=#{wlCode} AND material_code=#{materialCode} AND active_flag='1' + From afd05fdfed2a9a118f8961a1ac5d6d2c2089dc21 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Tue, 12 Mar 2024 16:02:58 +0800 Subject: [PATCH 02/13] =?UTF-8?q?wms=E7=99=BD=E5=9D=AF=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/service/impl/OdsWhiteEmbryoServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsWhiteEmbryoServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsWhiteEmbryoServiceImpl.java index e1f84d17..4c556145 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsWhiteEmbryoServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsWhiteEmbryoServiceImpl.java @@ -268,6 +268,8 @@ public class OdsWhiteEmbryoServiceImpl implements IOdsWhiteEmbryoService { @Override public String WhiteBilletReturnConfir(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn) { + DynamicDataSourceContextHolder.push("ds_" + wmsOdsEmStorageNewsSn.getFactoryCode()); + //退货的--在生产线上退下来的--托盘号，库位，物料号，物料描述，退货数量 String result="成功"; WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn1=new WmsOdsEmStorageNewsSn(); From e96300722b96c075ddad61558084e692c11ef6be Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Tue, 12 Mar 2024 16:32:23 +0800 Subject: [PATCH 03/13] =?UTF-8?q?wms=E7=99=BD=E5=9D=AF=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B910?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/wms/WmsOdsEmStorageNewsMapper.xml | 39 ++++++++++++++++++- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsEmStorageNewsMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsEmStorageNewsMapper.xml index 29c6749c..401c203a 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsEmStorageNewsMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsEmStorageNewsMapper.xml @@ -41,8 +41,43 @@ - select storage_id, wh_code, region_code, wa_code, storage_type, wl_code, material_code, material_desc, amount, storage_amount, occupy_amount, lpn, product_batch, receive_date, product_date, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, user_defined7, user_defined8, user_defined9, user_defined10, create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code, sap_factory_code, wl_name from wms_ods_em_storage_news - + SELECT + storage_id, + wh_code, + region_code, + wa_code, + storage_type, + wl_code, + material_code, + material_desc, + COALESCE(amount, 0) as amount, + storage_amount, + occupy_amount, + lpn, + product_batch, + receive_date, + product_date, + user_defined1, + user_defined2, + user_defined3, + user_defined4, + user_defined5, + user_defined6, + user_defined7, + user_defined8, + user_defined9, + user_defined10, + create_by, + gmt_create, + last_modified_by, + gmt_modified, + active_flag, + factory_code, + sap_factory_code, + wl_name + FROM + wms_ods_em_storage_news + + + @@ -451,4 +459,6 @@ record_id = #{item} + + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml index 2b70f44a..5cba2bec 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml @@ -203,22 +203,21 @@ and CONVERT(varchar(7),feedback_time, 120) = SUBSTRING(#{ymd},0,8) + + + + From 0128967ab90612f3c93c77174880722b999bb643 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 13 Mar 2024 15:02:10 +0800 Subject: [PATCH 08/13] =?UTF-8?q?2024-3-13=20=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=AE=A1=E7=90=86-=E8=AE=BE=E5=A4=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E5=A2=9E=E5=8A=A0sap=5Fcode=E5=92=8Csap=5Fname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/domain/BaseEquipment.java | 26 +++++++++++++++++++ .../mapper/wms/BaseEquipmentMapper.xml | 15 +++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java index 22c81ff6..22ba6574 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java @@ -346,6 +346,16 @@ public class BaseEquipment extends BaseEntity { @Excel(name = "计量单位") private String unitMeasurement; + //新增SAP字段 + /** + * SAP线体编码 + */ + private String sapCode; + /** + * SAP线体名称 + */ + private String sapName; + private String imageFileList; private String barCodeFileList; @@ -1134,6 +1144,22 @@ public class BaseEquipment extends BaseEntity { return unitMeasurement; } + //SAP线体编码 + public void setSapCode(String sapCode) { + this.sapCode = sapCode; + } + public String getSapCode() { + return sapCode; + } + + //SAP线体名称 + public void setSapName(String sapName) { + this.sapName = sapName; + } + public String getSapName() { + return sapName; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml index a4fbd98f..cf87e858 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml @@ -54,7 +54,8 @@ - + + @@ -175,7 +176,9 @@ asset_description, equipment_number, inventory_number, - unit_measurement + unit_measurement, + sap_code, + sap_name from base_equipment @@ -251,6 +254,8 @@ and equipment_number = #{equipmentNumber} and inventory_number = #{inventoryNumber} and unit_measurement = #{unitMeasurement} + and sap_code = #{sapCode} + and sap_name = #{sapName} and del_flag ='0' @@ -318,6 +323,8 @@ equipment_number, inventory_number, unit_measurement, + sap_code, + sap_name, #{equipmentCode}, @@ -368,6 +375,8 @@ #{equipmentNumber}, #{inventoryNumber}, #{unitMeasurement}, + #{sapCode}, + #{sapName}, @@ -427,6 +436,8 @@ equipment_number = #{equipmentNumber}, inventory_number = #{inventoryNumber}, unit_measurement = #{unitMeasurement}, + sap_code = #{sapCode}, + sap_name = #{sapName}, where equipment_id = #{equipmentId} From 916d9d86ff91deab5f56e69ff1cb69415df19de3 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 13 Mar 2024 16:40:19 +0800 Subject: [PATCH 09/13] =?UTF-8?q?2024-3-13=20=E8=AE=BE=E5=A4=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=B3=BB=E7=BB=9F-=E8=AE=BE=E5=A4=87=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF-=E8=AE=BE=E5=A4=87=E6=9C=89=E6=95=88=E5=88=A9?= =?UTF-8?q?=E7=94=A8=E7=8E=87=E5=85=AC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/device/service/impl/DeviceInterfaceServiceImpl.java | 2 +- .../main/resources/mapper/device/DeviceInterfaceMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java index 238a36b6..90224224 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java @@ -52,7 +52,7 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { /** * 获取设备信息 - * 故障停机率:（设备停机时间总和/一定时间内运行总时间（年）） + * 故障停机率:（设备停机时间总和/一定时间内运行总时间（今年运行的时间）） * 设备有效利用率：（实际产量/理论产量）改为：一定天数内该设备的总开机时间/（天数*24小时） * * @return diff --git a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml index 05bcf387..e1cd6ab8 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml @@ -48,8 +48,8 @@ be.equipment_name AS 'equipmentName', be.equipment_status AS 'equipmentStatus', be.department AS 'department', - ROUND(SUM(CAST(eo.fault_time AS FLOAT)) * 100 / SUM(CAST(eo.actual_operation_time AS FLOAT)),2) AS 'failureRate', - CAST(SUM(CAST(eo.actual_operation_time AS DECIMAL(10,2)))*100 / (365*24) AS DECIMAL(18,2)) AS 'utilizationRatio' + ROUND(SUM(CAST(eo.fault_time AS FLOAT)) * 100 / SUM(CAST(eo.operation_time AS FLOAT)),2) AS 'failureRate', + CAST(SUM(CAST(eo.actual_operation_time AS DECIMAL(10,2)))*100/(COUNT(eo.actual_operation_time)*24) AS DECIMAL(18,2)) AS 'utilizationRatio' FROM equ_operation eo LEFT JOIN base_equipment be ON eo.equipment_code = be.equipment_code From 5fac9b8abe76a3337b57527a2796603eb2e1b28a Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 13 Mar 2024 17:59:39 +0800 Subject: [PATCH 10/13] =?UTF-8?q?2024-3-13=20=E8=AE=BE=E5=A4=87=E6=A8=A1?= =?UTF-8?q?=E5=9D=97-=E7=82=B9=E6=A3=80=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/service/impl/EquSpotCheckServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java index 474cba85..a8a8661d 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java @@ -123,8 +123,9 @@ public class EquSpotCheckServiceImpl implements IEquSpotCheckService { * @return */ private AjaxResult formatEquItemCommon(List equPlanEquList, String planType, String message) { + //没有点检项的设备 + String equipmentList = ""; for (EquPlanEqu data : equPlanEquList) { - // 检查项名称临时对象 StringBuilder itemTempName = new StringBuilder(); @@ -169,9 +170,14 @@ public class EquSpotCheckServiceImpl implements IEquSpotCheckService { data.setItemTempName(itemTempName.toString());//处理好的检查项名称置入检查项名称（用于前端信息回显） } else { // 未查询到对应检查项信息 - return error(500, message); + equipmentList = equipmentList + '[' + data.getEquipmentCode() + "]"; } } + if(!equipmentList.equals("")){ + equipmentList = equipmentList + "设备未查询到对应检查项信息!"; + message = equipmentList; + return error(500, message); + } return success(equPlanEquList); } From 1801ac712294f0ca6ddd8ad132ab1231bb774085 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 13 Mar 2024 21:25:37 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E6=94=B6=E5=9D=AF=E6=9C=BA=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE+=E6=88=90?= =?UTF-8?q?=E5=93=81=E8=AE=A2=E5=8D=95=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IWCInterfaceServiceImpl.java | 19 ++++- .../plan/controller/ProOrderController.java | 18 +++- .../com/op/plan/mapper/ProOrderMapper.java | 3 +- .../plan/mapper/ProOrderWorkorderMapper.java | 6 ++ .../com/op/plan/service/IProOrderService.java | 2 + .../service/impl/ProOrderServiceImpl.java | 82 +++++++++++++++++++ .../resources/mapper/plan/ProOrderMapper.xml | 8 +- .../mapper/plan/ProOrderWorkorderMapper.xml | 34 ++++++++ 8 files changed, 168 insertions(+), 4 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index 349343ef..83c28596 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -191,9 +191,26 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { totals = mesMapper.getTotalNum(boardDTO); everys = mesMapper.getEveryNum(boardDTO); } - + /**质量看板测试开始**/ + if("equ_type_spj".equals(boardDTO.getEquTypeCode())){ + boardDTO.setEquTypeCode("equ_type_hf"); + totals = mesMapper.getTotalNum(boardDTO); + for(BoardDTO total:totals){ + total.setTotalNum(total.getTotalNum()-2); + total.setEquTypeCode(total.getEquTypeCode().replace("H","X")); + total.setEquTypeName(total.getEquTypeName().replace("烘房","收坯机")); + } + everys = mesMapper.getEveryNum(boardDTO); + for(BoardDTO every:everys){ + every.setTotalNum(every.getTotalNum()-2); + every.setEquCode(every.getEquCode().replace("H","X")); + every.setEquName(every.getEquName().replace("烘房","收坯机")); + } + } + /**质量看板测试结束**/ boardMap.put("totalNum", totals); boardMap.put("everyNum", everys); + return boardMap; } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java index adbc3918..d8bbab66 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java @@ -284,5 +284,21 @@ public class ProOrderController extends BaseController { public R syncSAPOrders() { return proOrderService.syncSAPOrders(); } - + /** + * 下发生产工单。workorderIds：母工单号 + */ + @RequiresPermissions("mes:pro:order:edit") + @Log(title = "关闭订单", businessType = BusinessType.OTHER) + @PostMapping("/deleteOrder/{orderIds}") + public AjaxResult deleteOrder(@PathVariable String[] orderIds) { + int m = proOrderService.deleteOrder(orderIds); + if(m==2){ + //有活动中的单 + return AjaxResult.error("订单拆分成的工单，已经进行生产，不允许关闭，请联系系统管理员！"); + }else if(m==1){ + return AjaxResult.success("订单关闭成功"); + }else{ + return AjaxResult.error(); + } + } } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java index 67b7ba88..0b0807e6 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java @@ -142,7 +142,8 @@ public interface ProOrderMapper { */ public List selectPackageLine(); - public void updateOrderBatch(@Param("workers") List workers); + public int updateOrderBatch(@Param("workers") List workers); + public int updateCloseOrderBatch(@Param("workers") List workers); /** * 通过id查询班次名称 diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java index 6749019c..a42f2eff 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java @@ -184,5 +184,11 @@ public interface ProOrderWorkorderMapper { ProOrderWorkorder getSonWorkOrder(ProOrderWorkorder whiteOrder); ProOrderWorkorder selectSonWorkOrder(String workorderCode); + + List getWorkOrderByOrders(@Param("orderIds")String[] orderIds); + + int deletePrepareBatch(@Param("workorders")List workorders); + + int deletePrepareDetailBatch(@Param("workorders")List workorders); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderService.java b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderService.java index fa89f96d..2b098a57 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderService.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderService.java @@ -141,4 +141,6 @@ public interface IProOrderService { AjaxResult getCascadeProOrder(String orderCode); int getProSortNo(ProOrder proOrder); + + int deleteOrder(String[] orderCodes); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java index 8e160ee4..04f47982 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java @@ -32,6 +32,7 @@ import com.op.system.api.RemoteSapService; import com.op.system.api.RemoteUserService; import com.op.system.api.domain.SysSapLog; import com.op.system.api.domain.SysUser; +import com.op.system.api.domain.sap.SapCloseOrderQuery; import com.op.system.api.domain.sap.SapShopOrderQuery; import com.op.system.api.model.SapProOrder; import org.apache.commons.lang3.time.DateFormatUtils; @@ -1084,6 +1085,87 @@ public class ProOrderServiceImpl implements IProOrderService { } return success(); } + + @Override + @DS("#header.poolName") + @Transactional(rollbackFor = Exception.class) + public int deleteOrder(String[] orderIds) { + //可以进行订单关闭的数据 + List checkWorkOrders = proOrderWorkorderMapper.getWorkOrderByOrders(orderIds); + if(checkWorkOrders.size() != orderIds.length){ + return 2; + } + for(ProOrderWorkorder workorder:checkWorkOrders){ + //要删除的工单id们 + List delteIds = new ArrayList<>(); + delteIds.add(workorder.getWorkorderId()); + //关闭订单用 + List ordercodes = new ArrayList<>(); + ordercodes.add(workorder.getWorkorderCodeSap()); + //删领料单用 + List workorderCodes = new ArrayList<>(); + workorderCodes.add(workorder.getWorkorderCode()); + //删除订单 + List workers = new ArrayList<>(); + workers.add(workorder); + ProOrderWorkorder topWork = workorder; + Boolean run = true; + while (run) { + //下级 + ProOrderWorkorder sonWorkers = proOrderWorkorderMapper.selectSonWorkOrder(topWork.getWorkorderCode()); + //有上级code + if (sonWorkers != null) { + workers.add(sonWorkers); + delteIds.add(sonWorkers.getWorkorderId()); + ordercodes.add(sonWorkers.getWorkorderCodeSap()); + workorderCodes.add(sonWorkers.getWorkorderCode()); + topWork.setWorkorderCode(sonWorkers.getWorkorderCode()); + } else { + run = false; + } + } + + //调用sap订单关闭接口 + //关闭母子订单//订单的订单编码(关闭订单暂时隐藏) + SapCloseOrderQuery sapCloseOrderQuery = new SapCloseOrderQuery(); + sapCloseOrderQuery.setOrderCodes(ordercodes); + R closeR= remoteSapService.sapCloseOrder(sapCloseOrderQuery); + logger.info(workorderCodes.get(0)+"删除订单后关闭订单"+ + JSONObject.toJSONString(sapCloseOrderQuery)+ + closeR.getCode()+","+ + closeR.getMsg()+","+ + closeR.getData()); + //if(closeR.getCode()==200){ + String[] workorderIds = (String[]) delteIds.toArray(new String[delteIds.size()]); + if (workorderIds.length > 0) { + //删除工单(字母)pro_order_workorder + int m1 = proOrderWorkorderMapper.deleteProOrderWorkorderByWorkorderIds(workorderIds); + logger.info(workorderCodes.get(0)+"删除订单m1:"+m1); + //删除批次pro_order_workorder_batch + int m2 = proOrderWorkorderBatchMapper.deleteBatch(workorderIds); + logger.info(workorderCodes.get(0)+"删除订单m2:"+m2); + //删除领料单mes_prepare + int m3 = proOrderWorkorderMapper.deletePrepareBatch(workorderCodes); + logger.info(workorderCodes.get(0)+"删除订单m3:"+m3); + //删除领料单明细mes_prepare_detail + int m4 = proOrderWorkorderMapper.deletePrepareDetailBatch(workorderCodes); + logger.info(workorderCodes.get(0)+"删除订单m4:"+m4); + } + + if (!CollectionUtils.isEmpty(workers)) { + //删除订单pro_order + int m5 = proOrderMapper.updateCloseOrderBatch(workers); + logger.info(workorderCodes.get(0)+"删除订单m5:"+m5); + } +// }else{ +// logger.info(workorder.getWorkorderCode()+"删除订单后关闭订单sap返回结果："+ +// JSONObject.toJSONString(closeR)); +// return 0; +// } + } + return 1; + } + public static void main(String args[]){ String arrayStr = "[[\"GX01\",\"LG1\"],[\"GX01\",\"LG2\"],[\"GX02\",\"S1\"],[\"GX02\",\"S2\"],[\"GX03\",\"HF01\"],[\"GX04\",\"SPJ01\"]]"; JSONArray jsonArray = JSONArray.parseArray(arrayStr); 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 4e810034..9542f4f8 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 @@ -321,7 +321,13 @@ where id = #{worker.orderId} - + + + update pro_order set del_flag = '1', + update_time = GETDATE() + where id = #{worker.orderId} + + update pro_order diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index 2528e57a..37eb1ed2 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -507,6 +507,22 @@ from pro_wet_material_plan_detail where workorder_id = #{workorderId} and del_flag = '0' + insert into mes_prepare_detail @@ -705,4 +721,22 @@ #{orderId} + + update mes_prepare + set del_flag = '1', + update_time = GETDATE() + where workorder_code in + + #{workorder} + + + + update mes_prepare_detail + set del_flag = '1', + update_time = GETDATE() + where parent_work_order in + + #{workorder} + + From d18d371883bdabfed425840d5a5cb3dc0503b297 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 14 Mar 2024 09:23:19 +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=B913?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/wms/controller/WmsToWCSmissionController.java | 9 ++++++++- .../java/com/op/wms/service/IWmsProductPutService.java | 2 ++ .../op/wms/service/impl/WmsProductPutServiceImpl.java | 8 ++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) 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 11c5b7bc..3889c0da 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 @@ -246,7 +246,14 @@ public class WmsToWCSmissionController { return AjaxResult.success(wmsProductPutService.addSnCorrelationBarcode(wmsProductPutTrayCode)); } - + /** + * 成品 + * 解除托盘关联箱码 + */ + @PostMapping("/deletSnCorrelationBarcode") + public AjaxResult deletSnCorrelationBarcode(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) { + return AjaxResult.success(wmsProductPutService.deletSnCorrelationBarcode(wmsProductPutTrayCode)); + } /** * 查询托盘和箱码的关系信息 * 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 35b25a27..fcb99546 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 @@ -87,4 +87,6 @@ public interface IWmsProductPutService { List selectSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode); String addSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode); + + String deletSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode); } 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 ebf52618..eb94d232 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 @@ -661,4 +661,12 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { return result; } + @Override + public String deletSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode) { + String result="解除成功"; + DynamicDataSourceContextHolder.push("ds_" + wmsProductPutTrayCode.getSiteCode()); + wmsProductPutTrayCodeMapper.deleteWmsProductPutTrayCodeByStorageId(wmsProductPutTrayCode.getStorageId()); + return result; + } + } From 5e11d5378303fad0bec57e357fccf0077aee1482 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Fri, 15 Mar 2024 14:30:55 +0800 Subject: [PATCH 13/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=B914?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsToWCSmissionController.java | 38 +++++++++++++ .../op/wms/domain/WmsProductPutTrayCode.java | 14 +++++ .../op/wms/service/IWmsProductPutService.java | 19 +++++-- .../impl/WmsProductPutServiceImpl.java | 54 +++++++++++++++++++ 4 files changed, 121 insertions(+), 4 deletions(-) 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 3889c0da..1ca666da 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 @@ -262,6 +262,44 @@ public class WmsToWCSmissionController { public AjaxResult selectSnCorrelationBarcode(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) { return AjaxResult.success(wmsProductPutService.selectSnCorrelationBarcode(wmsProductPutTrayCode)); } + + + /** + * 成品销售出库--提单查询接口 + * + */ + @PostMapping("/selectFinishedProductSales") + public AjaxResult selectFinishedProductSales(@RequestBody WmsSellOutEmbryo wmsSellOutEmbryo) { + return AjaxResult.success(wmsProductPutService.selectFinishedProductSales(wmsSellOutEmbryo)); + } + + + /** + * 成品销售出库--确认接口 + * + */ + @PostMapping("/confirmFinishedProductSales") + public AjaxResult confirmFinishedProductSales(@RequestBody WmsSellOutEmbryo wmsSellOutEmbryo) { + return AjaxResult.success(wmsProductPutService.confirmFinishedProductSales(wmsSellOutEmbryo)); + } + + /** + * 成品销售出库----整托扫码 + * + */ + @PostMapping("/ScanCodeWholePallet") + public AjaxResult ScanCodeWholePallet(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) { + return AjaxResult.success(wmsProductPutService.ScanCodeWholePallet(wmsProductPutTrayCode)); + } + /** + * 成品销售出库----单箱扫码 + * + */ + @PostMapping("/ScanCodeSingleBox") + public AjaxResult ScanCodeSingleBox(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) { + return AjaxResult.success(wmsProductPutService.ScanCodeSingleBox(wmsProductPutTrayCode)); + } + /** * 手持白胚入库查询 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java index 546f78ba..88e9ed32 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java @@ -32,6 +32,20 @@ public class WmsProductPutTrayCode extends BaseEntity { @Excel(name = "箱码") private String barcode; + /** + * 库位 + */ + @Excel(name = "库位") + private String wlCode; + + public String getWlCode() { + return wlCode; + } + + public void setWlCode(String wlCode) { + this.wlCode = wlCode; + } + /** * 数量 */ 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 fcb99546..d760e8d1 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 @@ -4,10 +4,7 @@ import java.text.ParseException; import java.util.List; import com.op.system.api.domain.wms.wmsReportWork; -import com.op.wms.domain.ProOrderWorkorder; -import com.op.wms.domain.WmsOdsWhiteEmbryoIn; -import com.op.wms.domain.WmsProductPut; -import com.op.wms.domain.WmsProductPutTrayCode; +import com.op.wms.domain.*; /** * 成品生产入库Service接口 @@ -89,4 +86,18 @@ public interface IWmsProductPutService { String addSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode); String deletSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode); + + List selectFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo); + + String confirmFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo); + /** + * 成品销售出库----整托扫码 + * + */ + List ScanCodeWholePallet(WmsProductPutTrayCode wmsProductPutTrayCode); + /** + * 成品销售出库----单箱扫码 + * + */ + WmsProductPutTrayCode ScanCodeSingleBox(WmsProductPutTrayCode wmsProductPutTrayCode); } 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 eb94d232..92f2f895 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 @@ -669,4 +669,58 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { return result; } + @Override + public List selectFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo) { + return null; + } + + @Override + public String confirmFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo) { + return null; + } + + @Override + public List ScanCodeWholePallet(WmsProductPutTrayCode wmsProductPutTrayCode) { + DynamicDataSourceContextHolder.push("ds_" + wmsProductPutTrayCode.getSiteCode()); + wmsProductPutTrayCode.setRelatStatus("1"); + List wmsProductPutTrayCodeList= wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode);//sn + WmsFpStorageNewsSn wmsFpStorageNewsSn=new WmsFpStorageNewsSn(); + wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn()); + wmsFpStorageNewsSn.setActiveFlag("1"); + List wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); + if (wmsFpStorageNewsSns.size()>0){ + WmsFpStorageNewsSn wmsFpStorageNewsSn1= wmsFpStorageNewsSns.get(0); + for (WmsProductPutTrayCode wmsProductPutTrayCode1: + wmsProductPutTrayCodeList) { + wmsProductPutTrayCode1.setWlCode(wmsFpStorageNewsSn1.getWlCode()); + } + } + + return wmsProductPutTrayCodeList; + } + + @Override + public WmsProductPutTrayCode ScanCodeSingleBox(WmsProductPutTrayCode wmsProductPutTrayCode) { + DynamicDataSourceContextHolder.push("ds_" + wmsProductPutTrayCode.getSiteCode()); + wmsProductPutTrayCode.setRelatStatus("1"); + //barcode + List wmsProductPutTrayCodeList= wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode); + //对应的箱码 + if (wmsProductPutTrayCodeList.size()>0){ + WmsProductPutTrayCode wmsProductPutTrayCode1= wmsProductPutTrayCodeList.get(0); + wmsProductPutTrayCode.setSn(wmsProductPutTrayCode1.getSn());//托盘 + WmsFpStorageNewsSn wmsFpStorageNewsSn=new WmsFpStorageNewsSn(); + wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn()); + wmsFpStorageNewsSn.setActiveFlag("1"); + List wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); + //库位 + if(wmsFpStorageNewsSns.size()>0){ + WmsFpStorageNewsSn wmsFpStorageNewsSn1= wmsFpStorageNewsSns.get(0); + wmsProductPutTrayCode.setWlCode( wmsFpStorageNewsSn1.getWlCode());//库位 + return wmsProductPutTrayCode; + } + } + return null; + } + }