From 8a69f82b0185813dc94cb5cb5593f37f7bc00c6c Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Wed, 24 Jul 2024 16:08:30 +0800
Subject: [PATCH] =?UTF-8?q?wms=E6=89=8B=E6=8C=81=E7=9A=84=E7=BA=BF?=
 =?UTF-8?q?=E4=BD=93=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WmsToWCSmissionController.java |   7 ++
 .../wms/mapper/WmsRuturnPutEmbryoMapper.java  |   3 +
 .../op/wms/service/IWmsProductPutService.java |   2 +
 .../impl/WmsProductPutServiceImpl.java        |   8 ++
 .../mapper/wms/WmsRuturnPutEmbryoMapper.xml   | 110 ++++++++++++++++++
 5 files changed, 130 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 f11d4734..c275c37f 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
@@ -5,6 +5,7 @@ package com.op.wms.controller;
 import com.op.common.core.utils.StringUtils;
 import com.op.common.core.web.domain.AjaxResult;
 
+import com.op.common.core.web.page.TableDataInfo;
 import com.op.system.api.RemoteOpenService;
 import com.op.wms.domain.*;
 import com.op.wms.service.*;
@@ -615,6 +616,12 @@ public class WmsToWCSmissionController {
         return success(odsProductEmbryoInventoryCorrelationList);
     }
 
+    //查询线体
+    @PostMapping("/listBaseEquipment")
+    public AjaxResult listBaseEquipment(@RequestBody    BaseEquipment baseEquipment) {
+        List<BaseEquipment> list = wmsProductPutService.selectBaseEquipmentList(baseEquipment);
+        return success(list);
+    }
 
 
     /**
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRuturnPutEmbryoMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRuturnPutEmbryoMapper.java
index 1de6f9b4..ebffa17b 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRuturnPutEmbryoMapper.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRuturnPutEmbryoMapper.java
@@ -1,5 +1,6 @@
 package com.op.wms.mapper;
 
+import com.op.wms.domain.BaseEquipment;
 import com.op.wms.domain.WmsRuturnPutEmbryo;
 
 import java.util.List;
@@ -23,4 +24,6 @@ public interface WmsRuturnPutEmbryoMapper {
     public List<WmsRuturnPutEmbryo> selectWmsRuturnPutEmbryoList(WmsRuturnPutEmbryo wmsRuturnPutEmbryo);
 
     void insertWmsRuturnPutEmbryo(WmsRuturnPutEmbryo wmsRuturnPutEmbryo1);
+
+    List<BaseEquipment> selectBaseEquipmentList(BaseEquipment baseEquipment);
 }
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 f9954c3a..bd910f3b 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
@@ -130,4 +130,6 @@ public interface IWmsProductPutService {
     List<WmsRuturnPutEmbryo> selectWmsRuturnPutEmbryoList(WmsRuturnPutEmbryo wmsRuturnPutEmbryo);
 
     String finishedProductSalesReturnTD(WmsRuturnPutEmbryo wmsRuturnPutEmbryo);
+
+    List<BaseEquipment> selectBaseEquipmentList(BaseEquipment baseEquipment);
 }
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 bcf01c55..04b66376 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
@@ -982,6 +982,14 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         }
         return results;
     }
+
+    @Override
+    public List<BaseEquipment> selectBaseEquipmentList(BaseEquipment baseEquipment) {
+        DynamicDataSourceContextHolder.push("ds_" + baseEquipment.getFactoryCode());
+        List<BaseEquipment> baseEquipments  =   wmsRuturnPutEmbryoMapper.selectBaseEquipmentList(baseEquipment);
+        return baseEquipments;
+    }
+
     @Override
     public List<WmsRuturnPutEmbryo> FinishedProductSalesReturn(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) {
         DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode());
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml
index d16d7d81..d854285d 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml
@@ -387,4 +387,114 @@
             </if>
         </where>
     </select>
+    <resultMap type="com.op.wms.domain.BaseEquipment" id="BaseEquipmentResult">
+        <result property="equipmentId" column="equipment_id"/>
+        <result property="equipmentCode" column="equipment_code"/>
+        <result property="equipmentName" column="equipment_name"/>
+        <result property="equipmentBrand" column="equipment_brand"/>
+        <result property="equipmentSpec" column="equipment_spec"/>
+        <result property="equipmentTypeId" column="equipment_type_id"/>
+        <result property="equipmentTypeCode" column="equipment_type_code"/>
+        <result property="equipmentTypeName" column="equipment_type_name"/>
+        <result property="workshopId" column="workshop_id"/>
+        <result property="workshopCode" column="workshop_code"/>
+        <result property="workshopName" column="workshop_name"/>
+        <result property="status" column="status"/>
+        <result property="remark" column="remark"/>
+        <result property="attr1" column="attr1"/>
+        <result property="attr2" column="attr2"/>
+        <result property="attr3" column="attr3"/>
+        <result property="attr4" column="attr4"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="unitWorkingHours" column="unit_working_hours"/>
+        <result property="workshopSection" column="workshop_section"/>
+        <result property="equipmentLocation" column="equipment_location"/>
+        <result property="hourlyUnitPrice" column="hourly_unit_price"/>
+        <result property="plcIp" column="plc_ip"/>
+        <result property="plcPort" column="plc_port"/>
+        <result property="equipmentBarcode" column="equipment_barcode"/>
+        <result property="equipmentBarcodeImage" column="equipment_barcode_image"/>
+        <result property="manufacturer" column="manufacturer"/>
+        <result property="supplier" column="supplier"/>
+        <result property="useLife" column="use_life"/>
+        <result property="buyTime" column="buy_time"/>
+        <result property="assetOriginalValue" column="asset_original_value"/>
+        <result property="netAssetValue" column="net_asset_value"/>
+        <result property="assetHead" column="asset_head"/>
+        <result property="fixedAssetCode" column="fixed_asset_code"/>
+        <result property="department" column="department"/>
+        <result property="sapAsset" column="sap_asset"/>
+        <result property="equipmentHead" column="equipment_head"/>
+        <result property="factoryCode" column="factory_code"/>
+        <result property="equipmentStatus" column="equipment_status"/>
+        <result property="equipmentCategory" column="equipment_category"/>
+        <result property="assetClassificationName" column="asset_classification_name"/>
+        <result property="assetDescription" column="asset_description"/>
+        <result property="equipmentNumber" column="equipment_number"/>
+        <result property="inventoryNumber" column="inventory_number"/>
+        <result property="unitMeasurement" column="unit_measurement"/>
+        <result property="sapCode" column="sap_code"/>
+        <result property="sapName" column="sap_name"/>
+        <result property="factoryWorkshop" column="factory_workshop"/>
+    </resultMap>
+    <select id="selectBaseEquipmentList"   resultMap="BaseEquipmentResult" >
+        select
+            equipment_id,
+            equipment_code,
+            equipment_name,
+            equipment_brand,
+            equipment_spec,
+            equipment_type_id,
+            equipment_type_code,
+            equipment_type_name,
+            workshop_id,
+            workshop_code,
+            workshop_name,
+            status,
+            remark,
+            attr1,
+            attr2,
+            attr3,
+            attr4,
+            create_by,
+            create_time,
+            update_by,
+            update_time,
+            workshop_section,
+            equipment_location,
+            hourly_unit_price,
+            unit_working_hours,
+            del_flag,
+            plc_ip,
+            plc_port,
+            sap_asset,
+            equipment_barcode,
+            equipment_barcode_image,
+            manufacturer,
+            supplier,
+            use_life,
+            buy_time,
+            asset_original_value,
+            net_asset_value,
+            asset_head,
+            fixed_asset_code,
+            department,
+            equipment_head,
+            factory_code,
+            equipment_status,
+            equipment_category,
+            asset_classification_name,
+            asset_description,
+            equipment_number,
+            inventory_number,
+            unit_measurement,
+            sap_code,
+            sap_name,
+            factory_workshop
+        from base_equipment		WHERE		equipment_type_code='equ_type_bzx'	AND	del_flag='0'
+    </select>
 </mapper>