Merge remote-tracking branch 'origin/master'

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

@@ -114,6 +114,17 @@ public class WmsToWCSmissionController {
      * 手持 －－包材采购单采购收货查询总共已经收货数量
      */
 
+    /**
+     * 手持 －－包材采购单采购收货确认操作
+     */
+
+    @PostMapping("/PurchaseOrderdeliPdaConfirm")
+    public AjaxResult PurchaseOrderdeliPdaConfirm(@RequestBody OdsProcureOrder odsProcureOrder) {
+//        odsProcureOrderService.PurchaseOrderdeliPdas(odsProcureOrder);
+//        return success();
+        String result = odsProcureOrderService.PurchaseOrderdeliPdaConfirm(odsProcureOrder);
+        return success(result);
+    }
     @PostMapping("/selectOdsProcureOrderAlready")
     public AjaxResult selectOdsProcureOrderAlready(@RequestBody OdsProcureOrder odsProcureOrder) {
 //        odsProcureOrderService.PurchaseOrderdeliPdas(odsProcureOrder);

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

@@ -2,6 +2,7 @@ package com.op.wms.mapper;
 
 import java.util.List;
 
+import com.op.wms.domain.OdsProcureOrder;
 import com.op.wms.domain.WCSInventoryPlan;
 import com.op.wms.domain.WmsRawOrderInSn;
 import com.op.wms.domain.WmsToWCSDTO;
@@ -66,4 +67,5 @@ public interface WmsRawOrderInSnMapper {
     void updateU1Byid(WmsRawOrderInSn wmsRawOrderInSn);
 
 
+    List<WmsRawOrderInSn> selecPurchaseOrderdeliPdaList(OdsProcureOrder odsProcureOrder);
 }

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

@@ -95,4 +95,6 @@ public interface IOdsProcureOrderService {
     void PurchaseOrderdeliPdas(OdsProcureOrder odsProcureOrder);
 
     List<OdsProcureOrder> selectOdsProcureOrderAlready(OdsProcureOrder odsProcureOrder);
+
+    String PurchaseOrderdeliPdaConfirm(OdsProcureOrder odsProcureOrder);
 }

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

@@ -72,6 +72,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
     @Autowired
     private BaseWarehouseMapper baseWarehouseMapper;
 
+
     /**
      * 查询包材采购单
      *
@@ -715,6 +716,36 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         return orderList;
     }
 
+    @Override
+    public String PurchaseOrderdeliPdaConfirm(OdsProcureOrder odsProcureOrder) {
+        DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
+        String  result="操作成功";
+        List<WmsRawOrderInSn> wmsRawOrderInSn  =   wmsRawOrderInSnMapper.selecPurchaseOrderdeliPdaList(odsProcureOrder);
+        for (WmsRawOrderInSn   order: wmsRawOrderInSn){
+//            //查询这次收货信息----生成质检任务-------      //插入检验集计划
+        QcCheckTaskIncomeDTO qcCheckTaskIncomeDTO = new QcCheckTaskIncomeDTO();
+        qcCheckTaskIncomeDTO.setCheckLoc("mjtest");
+        qcCheckTaskIncomeDTO.setCheckType("checkTypeLL");
+//		qcCheckTaskIncomeDTO.setCheckManCode("mobile");
+//		qcCheckTaskIncomeDTO.setCheckManName("手持测试用户");
+        OdsProcureOrder order1 = odsProcureOrderMapper.selectOdsProcureOrderByID(order.getUserDefined3());
+        qcCheckTaskIncomeDTO.setSupplierCode(order1.getSupplierCode());
+        String name = odsProcureOrderMapper.selectBaseSupplier(order1);
+        qcCheckTaskIncomeDTO.setSupplierName(name);
+        qcCheckTaskIncomeDTO.setOrderType("bc");
+        qcCheckTaskIncomeDTO.setUnit(order1.getUnit());
+        qcCheckTaskIncomeDTO.setFactoryCode(order1.getFactoryCode());
+        qcCheckTaskIncomeDTO.setQuality(order.getAmount());
+        qcCheckTaskIncomeDTO.setMaterialCode(order.getMaterialCode());
+        qcCheckTaskIncomeDTO.setMaterialName(order.getMaterialDesc());
+        qcCheckTaskIncomeDTO.setIncomeBatchNo(order.getIncomeBatchNo());
+        qcCheckTaskIncomeDTO.setOrderNo(order.getPoNo());
+        qcCheckTaskIncomeDTO.setIncomeTime(new Date());
+        remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO);
+        }
+        return result;
+    }
+
     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/BaseProductMapper.xml

@@ -232,7 +232,7 @@
             <if test="appendFlag != null">append_flag,</if>
             <if test="appendPercent != null">append_percent,</if>
             <if test="mtart != null">mtart,</if>
-            <if test="reportRate != null">report_rate,</if>
+            report_rate,
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="productId != null">#{productId},</if>
@@ -278,7 +278,7 @@
             <if test="appendFlag != null">#{appendFlag},</if>
             <if test="appendPercent != null">#{appendPercent},</if>
             <if test="mtart != null">#{mtart},</if>
-            <if test="reportRate != null">#{reportRate},</if>
+            #{reportRate},
         </trim>
     </insert>
 

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

@@ -201,5 +201,28 @@
 			user_defined1 = '2'
 		where raw_order_in_sn_id=#{rawOrderInSnId}
 	</update>
+    <select id="selecPurchaseOrderdeliPdaList"  parameterType="com.op.wms.domain.OdsProcureOrder" resultMap="WmsRawOrderInSnResult">
+        SELECT
+            wh_code,
+            po_no,
+            material_code,
+            material_desc,
+            sum ( amount ) AS amount,
+            user_defined2,
+            user_defined3
+        FROM
+            wms_raw_order_in_sn
+        WHERE
+            user_defined5 = #{receiptNoCode}
+          AND	active_flag='1'
+        GROUP BY
+            wh_code,
+            po_no,
+            material_code,
+            material_desc,
+            user_defined2,
+            user_defined3,
+            user_defined4;
 
+    </select>
 </mapper>