成品入库修改2

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

@@ -310,7 +310,7 @@ public class WmsToWCSmissionController {
         if (wmsProductPut1==null) {
             return  AjaxResult.error("标识卡未绑定");
         }
-        return AjaxResult.success();
+        return AjaxResult.success(wmsProductPut1);
     }
 
 

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

@@ -1041,13 +1041,23 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         wmsProductPut.setAttribute2(attribute2);
         wmsProductPut.setAttribute3(attribute3);
         WmsProductPut wmsProductPut1 = wmsProductPutMapper.WmsProductPutByWorkOrderqueryBS(wmsProductPut);
+        WmsProductPut  wmsProductPut2    =new WmsProductPut();
+        wmsProductPut2.setWorkOrder(attribute1);
+        wmsProductPut2.setBatchNumber(attribute2);
+        wmsProductPut2.setPallet(attribute3);
+        WmsProductPut   wmsProductPut3=  wmsProductPutMapper.selectProOrderWorkorderBatchPallet(wmsProductPut2);
+        //wmsProductPut.setProductCode(wmsProductPut3.getProductCode());
+       // wmsProductPut.setProductName(wmsProductPut3.getProductName());
+       // wmsProductPut.setUnitOfMeasure(wmsProductPut3.getAttr5());
+        wmsProductPut1.setNumber(wmsProductPut3.getAttr3());
+
         //获取托盘信息--首先要他们有绑定数据
         WmsProductProductionRecords wmsProductProductionRecord=new WmsProductProductionRecords();
         wmsProductProductionRecord.setUserDefined1(wmsProductPut.getPallet());
         List<WmsProductProductionRecords> wmsProductProductionRecords=     wmsProductPutRecordsMapper.selectProductProductionRecords(wmsProductProductionRecord);
         if (wmsProductProductionRecords.size()>0){
             WmsProductProductionRecords wmsProductProductionRecords1=   wmsProductProductionRecords.get(0);
-            wmsProductPut.setSn(wmsProductProductionRecords1.getSn());
+            wmsProductPut1.setSn(wmsProductProductionRecords1.getSn());
         }else {
             return  null;
         }

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

@@ -419,7 +419,8 @@
             pro_order_workorder_batch_pallet.quantity  AS attr3,
             pro_order_workorder.workorder_name      AS  attr4,
             pro_order_workorder.product_code,
-                pro_order_workorder.product_name
+           pro_order_workorder.product_name,
+            pro_order_workorder.unit        AS  attr5
         FROM
             pro_order_workorder_batch_pallet
                 LEFT JOIN pro_order_workorder ON pro_order_workorder.workorder_code_sap= pro_order_workorder_batch_pallet.workorder_code