wms包材部分修改40

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

@@ -110,6 +110,17 @@ public class WmsToWCSmissionController {
         int tem = odsProcureOrderService.PurchaseOrderdeliPda(odsProcureOrder);
         return success(tem);
     }
+    /**
+     * 手持 －－包材采购单采购收货查询总共已经收货数量
+     */
+
+    @PostMapping("/selectOdsProcureOrderAlready")
+    public AjaxResult selectOdsProcureOrderAlready(@RequestBody OdsProcureOrder odsProcureOrder) {
+//        odsProcureOrderService.PurchaseOrderdeliPdas(odsProcureOrder);
+//        return success();
+        List<OdsProcureOrder> orderList = odsProcureOrderService.selectOdsProcureOrderAlready(odsProcureOrder);
+        return success(orderList);
+    }
 
     /**
      * 手持 －－包材采购单采购查询明细

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

@@ -98,6 +98,20 @@ public class OdsProcureOrder extends BaseEntity {
     @Excel(name = "采购单号")
     private String procureCode;
 
+    /**
+     * 收货单号
+     */
+    @Excel(name = "收货单号")
+    private String receiptNoCode;
+
+    public String getReceiptNoCode() {
+        return receiptNoCode;
+    }
+
+    public void setReceiptNoCode(String receiptNoCode) {
+        this.receiptNoCode = receiptNoCode;
+    }
+
     /**
      * 物料编码
      */

op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java

@@ -62,4 +62,6 @@ public interface OdsProcureOrderMapper {
     Integer updateRealityNuById(OdsProcureOrder odsProcureOrder);
 
     String selectBaseSupplier(OdsProcureOrder odsProcureOrder);
+
+    List<OdsProcureOrder> selectOdsProcureOrderAlreadyList(OdsProcureOrder odsProcureOrder);
 }

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

@@ -93,4 +93,6 @@ public interface IOdsProcureOrderService {
     AjaxResult sapPurchaseOrderSync(OdsProcureOrder odsProcureOrder);
 
     void PurchaseOrderdeliPdas(OdsProcureOrder odsProcureOrder);
+
+    List<OdsProcureOrder> selectOdsProcureOrderAlready(OdsProcureOrder odsProcureOrder);
 }

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

@@ -154,9 +154,9 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
     @Override
     //@DS("#header.poolName")
     public int PurchaseOrderdeliPda(OdsProcureOrder odsProcureOrder) {
-        //收货记录－－rawOrderInSnId。修改收货数量
+        //收货记录－－rawOrderInSnId。修改收货数量-------------
         DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
-
+        //--receiptNoCode收货单号
         OdsProcureOrder order = odsProcureOrderMapper.selectOdsProcureOrderByID(odsProcureOrder.getID());
         //wms_raw_order_in_sn
         WmsRawOrderInSn wmsRawOrderInSn = new WmsRawOrderInSn();
@@ -176,34 +176,35 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         wmsRawOrderInSn.setSn(odsProcureOrder.getSn());//托盘号
         wmsRawOrderInSn.setFactoryCode(odsProcureOrder.getSiteCode());
         wmsRawOrderInSn.setUserDefined3(order.getID());
+        wmsRawOrderInSn.setUserDefined5(odsProcureOrder.getReceiptNoCode());
         wmsRawOrderInSnMapper.insertWmsRawOrderInSn(wmsRawOrderInSn);
         //插入收货记录
         //如果收货完成了的话，就插入信息收货完成
         odsProcureOrder.setOrderStatus("1");
         BigDecimal result = order.getRealityNumber().add(odsProcureOrder.getPlanNumber());
         if (result.equals(order.getPlanNumber())) {
-            odsProcureOrder.setOrderStatus("2");
+            odsProcureOrder.setOrderStatus("2");//
         }
         Integer tem = odsProcureOrderMapper.updateRealityNuById(odsProcureOrder);
         //插入检验集计划
-        QcCheckTaskIncomeDTO qcCheckTaskIncomeDTO = new QcCheckTaskIncomeDTO();
+//        QcCheckTaskIncomeDTO qcCheckTaskIncomeDTO = new QcCheckTaskIncomeDTO();
-        qcCheckTaskIncomeDTO.setCheckLoc("mjtest");
+//        qcCheckTaskIncomeDTO.setCheckLoc("mjtest");
-        qcCheckTaskIncomeDTO.setCheckType("checkTypeLL");
+//        qcCheckTaskIncomeDTO.setCheckType("checkTypeLL");
-//		qcCheckTaskIncomeDTO.setCheckManCode("mobile");
+////		qcCheckTaskIncomeDTO.setCheckManCode("mobile");
-//		qcCheckTaskIncomeDTO.setCheckManName("手持测试用户");
+////		qcCheckTaskIncomeDTO.setCheckManName("手持测试用户");
-        qcCheckTaskIncomeDTO.setSupplierCode(order.getSupplierCode());
+//        qcCheckTaskIncomeDTO.setSupplierCode(order.getSupplierCode());
-        String name = odsProcureOrderMapper.selectBaseSupplier(odsProcureOrder);
+//        String name = odsProcureOrderMapper.selectBaseSupplier(odsProcureOrder);
-        qcCheckTaskIncomeDTO.setSupplierName(name);
+//        qcCheckTaskIncomeDTO.setSupplierName(name);
-        qcCheckTaskIncomeDTO.setOrderType("bc");
+//        qcCheckTaskIncomeDTO.setOrderType("bc");
-        qcCheckTaskIncomeDTO.setUnit(order.getUnit());
+//        qcCheckTaskIncomeDTO.setUnit(order.getUnit());
-        qcCheckTaskIncomeDTO.setFactoryCode(odsProcureOrder.getFactoryCode());
+//        qcCheckTaskIncomeDTO.setFactoryCode(odsProcureOrder.getFactoryCode());
-        qcCheckTaskIncomeDTO.setQuality(odsProcureOrder.getPlanNumber());
+//        qcCheckTaskIncomeDTO.setQuality(odsProcureOrder.getPlanNumber());
-        qcCheckTaskIncomeDTO.setMaterialCode(odsProcureOrder.getMaterialCode());
+//        qcCheckTaskIncomeDTO.setMaterialCode(odsProcureOrder.getMaterialCode());
-        qcCheckTaskIncomeDTO.setMaterialName(odsProcureOrder.getSupplierName());
+//        qcCheckTaskIncomeDTO.setMaterialName(odsProcureOrder.getSupplierName());
-        qcCheckTaskIncomeDTO.setIncomeBatchNo(odsProcureOrder.getIncomeBatchNo());
+//        qcCheckTaskIncomeDTO.setIncomeBatchNo(odsProcureOrder.getIncomeBatchNo());
-        qcCheckTaskIncomeDTO.setOrderNo(order.getProcureCode());
+//        qcCheckTaskIncomeDTO.setOrderNo(order.getProcureCode());
-        qcCheckTaskIncomeDTO.setIncomeTime(new Date());
+//        qcCheckTaskIncomeDTO.setIncomeTime(new Date());
-        remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO);
+//        remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO);
         return tem;
     }
 
@@ -649,7 +650,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
     public AjaxResult sapPurchaseOrderSync(OdsProcureOrder odsProcureOrder) {
         DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
         SapPurchaseOrderQuery sapPurchaseOrderQuery = new SapPurchaseOrderQuery();
-        sapPurchaseOrderQuery.setEbeln(odsProcureOrder.getProcureCode());
+        sapPurchaseOrderQuery.setEbeln(odsProcureOrder.getProcureCode());//采购单号
         R result = remoteSapService.sapPurchaseOrderSync(sapPurchaseOrderQuery);
         List<Map<String, String>> mapList = new ArrayList<>();
         mapList = (List<Map<String, String>>) result.getData();
@@ -707,6 +708,13 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO);
     }
 
+    @Override
+    public List<OdsProcureOrder> selectOdsProcureOrderAlready(OdsProcureOrder odsProcureOrder) {
+        DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
+        List<OdsProcureOrder>   orderList=  odsProcureOrderMapper.selectOdsProcureOrderAlreadyList(odsProcureOrder);
+        return orderList;
+    }
+
     public String DesignatedPalletOutboundWCS(WMSDesignatedPalle wmsDesignatedPalle) {
         // 定义请求的URL地址
         String url = "http://192.168.202.37:9001/api/v1/ReceiveMesMsg/packingMaterialsOutBoundByPallet";

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

@@ -212,4 +212,8 @@
     <select id="selectBaseSupplier" resultType="java.lang.String">
 		SELECT	DISTINCT	zh_desc	FROM	base_supplier	WHERE	supplier_code= #{supplierCode}
 	</select>
+    <select id="selectOdsProcureOrderAlreadyList"   parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
+        <include refid="selectOdsProcureOrderVo"/>
+        <![CDATA[  where   Procure_Code = #{procureCode}  and Active='1'   AND Order_Status <> 0 ]]>
+    </select>
 </mapper>