wms成品部分代码修改15

op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java

@@ -262,7 +262,14 @@ public class WmsToWCSmissionController {
     public AjaxResult selectSnCorrelationBarcode(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) {
         return AjaxResult.success(wmsProductPutService.selectSnCorrelationBarcode(wmsProductPutTrayCode));
     }
-
+    /**
+     * 成品销售出库--查询接口
+     *
+     */
+    @PostMapping("/selectQueryFinishedProductSales")
+    public AjaxResult selectQueryFinishedProductSales(@RequestBody WmsSellOutEmbryo wmsSellOutEmbryo) {
+        return AjaxResult.success(wmsProductPutService.selectQueryFinishedProductSales(wmsSellOutEmbryo));
+    }
 
     /**
      * 成品销售出库--提单查询接口

op-modules/op-wms/src/main/java/com/op/wms/domain/WmsSellOutEmbryo.java

@@ -202,6 +202,19 @@ public class WmsSellOutEmbryo extends BaseEntity {
      */
     @Excel(name = "预留字段10")
     private String attr10;
+    /**
+     * 有效标记
+     */
+    @Excel(name = "有效标记")
+    private String activeFlag;
+
+    public String getActiveFlag() {
+        return activeFlag;
+    }
+
+    public void setActiveFlag(String activeFlag) {
+        this.activeFlag = activeFlag;
+    }
 
     public void setId(String id) {
         this.id = id;

op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java

@@ -100,4 +100,9 @@ public interface IWmsProductPutService {
      *
      */
     WmsProductPutTrayCode ScanCodeSingleBox(WmsProductPutTrayCode wmsProductPutTrayCode);
+    /**
+     * 成品销售出库--查询接口
+     *
+     */
+    List< WmsSellOutEmbryo> selectQueryFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java

@@ -59,6 +59,9 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
 
     @Autowired
     private WmsProductPutTrayCodeMapper wmsProductPutTrayCodeMapper;
+    @Autowired
+    private WmsSellOutEmbryoMapper wmsSellOutEmbryoMapper;
+
     /**
      * 查询成品生产入库
      *
@@ -723,4 +726,13 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         return null;
     }
 
+    @Override
+    public List<WmsSellOutEmbryo> selectQueryFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo) {
+        //wms_sell_out_embryo
+        DynamicDataSourceContextHolder.push("ds_" + wmsSellOutEmbryo.getFactoryCode());
+        wmsSellOutEmbryo.setActiveFlag("1");
+        List<WmsSellOutEmbryo>  wmsSellOutEmbryoList=     wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoList(wmsSellOutEmbryo);
+        return wmsSellOutEmbryoList;
+    }
+
 }

op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml

@@ -41,10 +41,11 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="activeFlag" column="active_flag"/>
     </resultMap>
 
     <sql id="selectWmsSellOutEmbryoVo">
-		select id, delivery_order, Item_number, factory_code, wh_code, wa_code, wl_code, delivery_place, product_name, product_code, product_sort, specification, unit_of_measure, lot_number, plan_quantity, out_quantity, status, SAP_status, SAP_proof, SAP_message, out_date, attr1, attr2, attr3, attr4, attr5, attr6, attr7, attr8, attr9, attr10, create_by, create_time, update_by, update_time, remark from wms_sell_out_embryo
+		select id, delivery_order, Item_number,active_flag, factory_code, wh_code, wa_code, wl_code, delivery_place, product_name, product_code, product_sort, specification, unit_of_measure, lot_number, plan_quantity, out_quantity, status, SAP_status, SAP_proof, SAP_message, out_date, attr1, attr2, attr3, attr4, attr5, attr6, attr7, attr8, attr9, attr10, create_by, create_time, update_by, update_time, remark from wms_sell_out_embryo
 	</sql>
 
     <select id="selectWmsSellOutEmbryoList" parameterType="WmsSellOutEmbryo" resultMap="WmsSellOutEmbryoResult">
@@ -72,6 +73,7 @@
             <if test="sapProof != null  and sapProof != ''">and SAP_proof = #{sapProof}</if>
             <if test="sapMessage != null  and sapMessage != ''">and SAP_message = #{sapMessage}</if>
             <if test="outDate != null ">and out_date = #{outDate}</if>
+            <if test="activeFlag != null  and activeFlag != ''">and active_flag = #{activeFlag}</if>
             <if test="attr1 != null  and attr1 != ''">and attr1 = #{attr1}</if>
             <if test="attr2 != null  and attr2 != ''">and attr2 = #{attr2}</if>
             <if test="attr3 != null  and attr3 != ''">and attr3 = #{attr3}</if>