成品生产记录记录修改，和成品入库修改1

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

@@ -49,7 +49,11 @@ public class OdsProcureOrderController extends BaseController {
         List<OdsProcureOrder> list = odsProcureOrderService.selectOdsProcureOrderList(odsProcureOrder);
         return getDataTable(list);
     }
-
+    /**获取标识卡**/
+    @PostMapping("/getIdCardList")
+    public List<ProOrderWorkorder> getIdCardList(@RequestBody OdsProcureOrder odsProcureOrder) {
+        return odsProcureOrderService.getIdCardList(odsProcureOrder);
+    }
     /**
      * 导出包材采购单列表
      */

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

@@ -301,13 +301,20 @@ public class WmsToWCSmissionController {
         return AjaxResult.success(wmsProductPutService.WmsProductPutByWorkOrderquery(wmsProductPut));
     }
     /**
-     * 成品
+     * 成品入库
      * 手持接口：根据报工单号查询－－新---改成扫标识卡
      */
     @PostMapping("/WmsProductPutByWorkOrderqueryBS")
     public AjaxResult WmsProductPutByWorkOrderqueryBS(@RequestBody WmsProductPut wmsProductPut) {
-        return AjaxResult.success(wmsProductPutService.WmsProductPutByWorkOrderqueryBS(wmsProductPut));
+        WmsProductPut   wmsProductPut1=   wmsProductPutService.WmsProductPutByWorkOrderqueryBS(wmsProductPut);
+        if (wmsProductPut1==null) {
+            return  AjaxResult.error("标识卡未绑定");
+        }
+        return AjaxResult.success();
     }
+
+
+
     /**
      * 成品
      * 手持接口：确认
@@ -644,6 +651,15 @@ public class WmsToWCSmissionController {
      Integer    result= wmsProductPutService.finishedProductProductionRecords(proOrderWorkorder);
         return success(result);
     }
+    /**
+     * 成品
+     * 手持接口：扫标识卡带出信息
+     */
+    @PostMapping("/finishedProductProductionRecordscar")
+    public AjaxResult finishedProductProductionRecordscar(@RequestBody ProOrderWorkorder proOrderWorkorder) {
+        ProOrderWorkorder   proOrderWorkorder1=   wmsProductPutService.finishedProductProductionRecordscar(proOrderWorkorder);
+        return AjaxResult.success(proOrderWorkorder1);
+    }
 //    //查询--成品生产记录
 //    @PostMapping("/selectProductProductionRecords")
 //    public AjaxResult selectProductProductionRecords(@RequestBody   WmsProductProductionRecords wmsProductProductionRecords) {

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

@@ -185,6 +185,33 @@ public class ProOrderWorkorder extends TreeEntity {
     private String prodType;
     @Excel(name = "托盘")
     private String sn;
+    private String attribute1 ;
+    private String attribute2;
+    private String attribute3;
+
+    public String getAttribute1() {
+        return attribute1;
+    }
+
+    public void setAttribute1(String attribute1) {
+        this.attribute1 = attribute1;
+    }
+
+    public String getAttribute2() {
+        return attribute2;
+    }
+
+    public void setAttribute2(String attribute2) {
+        this.attribute2 = attribute2;
+    }
+
+    public String getAttribute3() {
+        return attribute3;
+    }
+
+    public void setAttribute3(String attribute3) {
+        this.attribute3 = attribute3;
+    }
 
     public String getProdLineName() {
         return prodLineName;

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

@@ -70,4 +70,6 @@ public interface OdsProcureOrderMapper {
     List<OdsProcureOrder> selectOdsProcureOrderAlreadyReaderList(OdsProcureOrder odsProcureOrder);
 
     void updateOdsProcureOrderByProcureCode(OdsProcureOrder odsProcureOrder);
+
+    List<OdsProcureOrder> getIdCardList(OdsProcureOrder odsProcureOrder);
 }

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

@@ -79,6 +79,8 @@ public interface WmsProductPutMapper {
 
     WmsProductPut WmsProductPutByWorkOrderqueryBS(WmsProductPut wmsProductPut);
 
+    WmsProductPut selectProOrderWorkorderBatchPallet(WmsProductPut wmsProductPut);
+
 
 //    String selectWmsProductPutNum(wmsReportWork wmsReportWork);
 }

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

@@ -111,4 +111,6 @@ public interface IOdsProcureOrderService {
     OrderLine addPurchaseOrderOutboundfc(OrderLine orderLine);
 
     void OutboundPostingSAPfc(List<OdsProcureOutOrder> orderList);
+
+    List<ProOrderWorkorder> getIdCardList(OdsProcureOrder odsProcureOrder);
 }

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

@@ -140,4 +140,6 @@ public interface IWmsProductPutService {
     List<WmsProductProductionRecords> selectProductProductionRecords(WmsProductProductionRecords wmsProductProductionRecords);
 
     WmsProductPut WmsProductPutByWorkOrderqueryBS(WmsProductPut wmsProductPut);
+
+    ProOrderWorkorder finishedProductProductionRecordscar(ProOrderWorkorder proOrderWorkorder);
 }

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

@@ -1044,6 +1044,13 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         }
     }
 
+    @Override
+    public List<ProOrderWorkorder> getIdCardList(OdsProcureOrder odsProcureOrder) {
+        List<OdsProcureOrder> orderList=   odsProcureOrderMapper.getIdCardList(odsProcureOrder);
+
+        return null;
+    }
+
     public String DesignatedPalletOutboundWCS(WMSDesignatedPalle wmsDesignatedPalle) {
         // 定义请求的URL地址
         String url = "http://192.168.202.37:9001/api/v1/ReceiveMesMsg/packingMaterialsOutBoundByPallet";

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

@@ -1041,9 +1041,42 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         wmsProductPut.setAttribute2(attribute2);
         wmsProductPut.setAttribute3(attribute3);
         WmsProductPut wmsProductPut1 = wmsProductPutMapper.WmsProductPutByWorkOrderqueryBS(wmsProductPut);
+        //获取托盘信息--首先要他们有绑定数据
+        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());
+        }else {
+            return  null;
+        }
         return wmsProductPut1;
     }
 
+    @Override
+    public ProOrderWorkorder finishedProductProductionRecordscar(ProOrderWorkorder proOrderWorkorder) {
+        DynamicDataSourceContextHolder.push("ds_" + proOrderWorkorder.getFactoryCode());
+        String[] attributes = proOrderWorkorder.getAttr1().split("-");
+        // 通过索引访问分割后的数组，获取所需的三个属性
+        String attribute1 = attributes[0]; // 获取第一个属性
+        String attribute2 = attributes[1]; // 获取第二个属性
+        String attribute3 = attributes[2]; // 获取第三个属性
+        proOrderWorkorder.setWorkorderCodeSap(attribute1);
+        proOrderWorkorder.setBatchCode(attribute2);
+        WmsProductPut  wmsProductPut    =new WmsProductPut();
+        wmsProductPut.setWorkOrder(attribute1);
+        wmsProductPut.setBatchNumber(attribute2);
+        wmsProductPut.setPallet(attribute3);
+        WmsProductPut   wmsProductPut1=  wmsProductPutMapper.selectProOrderWorkorderBatchPallet(wmsProductPut);
+        proOrderWorkorder.setQuantity(wmsProductPut1.getAttr3());
+        proOrderWorkorder.setProdLineCode(wmsProductPut1.getAttr4());
+        proOrderWorkorder.setProductCode(wmsProductPut1.getProductCode());
+        proOrderWorkorder.setProductName(wmsProductPut1.getProductName());
+//      proOrderWorkorder.setAttribute3(attribute3);
+        return proOrderWorkorder;
+    }
+
     @Override
     public List<WmsRuturnPutEmbryo> FinishedProductSalesReturn(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) {
         DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode());

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

@@ -80,6 +80,7 @@
             <if test="enterpriseId != null  and enterpriseId != ''">and Enterprise_Id = #{enterpriseId}</if>
             <if test="enterpriseCode != null  and enterpriseCode != ''">and Enterprise_Code = #{enterpriseCode}</if>
         </where>
+        order by Create_Date desc
     </select>
 
     <select id="selectOdsProcureOrderByID" parameterType="String" resultMap="OdsProcureOrderResult">
@@ -249,5 +250,7 @@
           and  Active=   #{Active}
 
     </select>
+    <select id="getIdCardList">
+    </select>
 </mapper>
 

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

@@ -414,5 +414,19 @@
           AND mes_report_work.batch=#{attribute2}
           AND mes_report_work.parent_order = '0'
     </select>
+    <select id="selectProOrderWorkorderBatchPallet" resultMap="WmsProductPutResult">
+        SELECT
+            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
+        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
+        WHERE
+            pro_order_workorder_batch_pallet.workorder_code= #{workOrder}
+          AND pro_order_workorder_batch_pallet.batch_code= #{batchNumber}
+          AND pro_order_workorder_batch_pallet.pallet_num=  #{pallet}
 
+    </select>
 </mapper>

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

@@ -240,5 +240,6 @@
             <if test="productDate != null  ">and    product_date= #{productDate}</if>
             <if test="siteCode != null  and siteCode != ''">and siteCode = #{siteCode}</if>
         </where>
+        order by create_time desc
     </select>
 </mapper>