wms成品部分代码修改14

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

@@ -262,6 +262,44 @@ public class WmsToWCSmissionController {
     public AjaxResult selectSnCorrelationBarcode(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) {
         return AjaxResult.success(wmsProductPutService.selectSnCorrelationBarcode(wmsProductPutTrayCode));
     }
+
+
+    /**
+     * 成品销售出库--提单查询接口
+     *
+     */
+    @PostMapping("/selectFinishedProductSales")
+    public AjaxResult selectFinishedProductSales(@RequestBody WmsSellOutEmbryo wmsSellOutEmbryo) {
+        return AjaxResult.success(wmsProductPutService.selectFinishedProductSales(wmsSellOutEmbryo));
+    }
+
+
+    /**
+     * 成品销售出库--确认接口
+     *
+     */
+    @PostMapping("/confirmFinishedProductSales")
+    public AjaxResult confirmFinishedProductSales(@RequestBody WmsSellOutEmbryo wmsSellOutEmbryo) {
+        return AjaxResult.success(wmsProductPutService.confirmFinishedProductSales(wmsSellOutEmbryo));
+    }
+
+    /**
+     * 成品销售出库----整托扫码
+     *
+     */
+    @PostMapping("/ScanCodeWholePallet")
+    public AjaxResult ScanCodeWholePallet(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) {
+        return AjaxResult.success(wmsProductPutService.ScanCodeWholePallet(wmsProductPutTrayCode));
+    }
+    /**
+     * 成品销售出库----单箱扫码
+     *
+     */
+    @PostMapping("/ScanCodeSingleBox")
+    public AjaxResult ScanCodeSingleBox(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) {
+        return AjaxResult.success(wmsProductPutService.ScanCodeSingleBox(wmsProductPutTrayCode));
+    }
+
     /**
      * 手持白胚入库查询
      */

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

@@ -32,6 +32,20 @@ public class WmsProductPutTrayCode extends BaseEntity {
     @Excel(name = "箱码")
     private String barcode;
 
+    /**
+     * 库位
+     */
+    @Excel(name = "库位")
+    private String wlCode;
+
+    public String getWlCode() {
+        return wlCode;
+    }
+
+    public void setWlCode(String wlCode) {
+        this.wlCode = wlCode;
+    }
+
     /**
      * 数量
      */

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

@@ -4,10 +4,7 @@ import java.text.ParseException;
 import java.util.List;
 
 import com.op.system.api.domain.wms.wmsReportWork;
-import com.op.wms.domain.ProOrderWorkorder;
-import com.op.wms.domain.WmsOdsWhiteEmbryoIn;
-import com.op.wms.domain.WmsProductPut;
-import com.op.wms.domain.WmsProductPutTrayCode;
+import com.op.wms.domain.*;
 
 /**
  * 成品生产入库Service接口
@@ -89,4 +86,18 @@ public interface IWmsProductPutService {
     String addSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode);
 
     String deletSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode);
+
+    List<WmsSellOutEmbryo> selectFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo);
+
+    String confirmFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo);
+    /**
+     * 成品销售出库----整托扫码
+     *
+     */
+    List<WmsProductPutTrayCode> ScanCodeWholePallet(WmsProductPutTrayCode wmsProductPutTrayCode);
+    /**
+     * 成品销售出库----单箱扫码
+     *
+     */
+    WmsProductPutTrayCode ScanCodeSingleBox(WmsProductPutTrayCode wmsProductPutTrayCode);
 }

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

@@ -669,4 +669,58 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         return result;
     }
 
+    @Override
+    public List<WmsSellOutEmbryo> selectFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo) {
+        return null;
+    }
+
+    @Override
+    public String confirmFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo) {
+        return null;
+    }
+
+    @Override
+    public List<WmsProductPutTrayCode> ScanCodeWholePallet(WmsProductPutTrayCode wmsProductPutTrayCode) {
+        DynamicDataSourceContextHolder.push("ds_" + wmsProductPutTrayCode.getSiteCode());
+        wmsProductPutTrayCode.setRelatStatus("1");
+        List<WmsProductPutTrayCode>  wmsProductPutTrayCodeList= wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode);//sn
+        WmsFpStorageNewsSn  wmsFpStorageNewsSn=new WmsFpStorageNewsSn();
+        wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn());
+        wmsFpStorageNewsSn.setActiveFlag("1");
+        List<WmsFpStorageNewsSn>    wmsFpStorageNewsSns=   wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn);
+        if (wmsFpStorageNewsSns.size()>0){
+            WmsFpStorageNewsSn  wmsFpStorageNewsSn1=     wmsFpStorageNewsSns.get(0);
+            for (WmsProductPutTrayCode  wmsProductPutTrayCode1:
+                    wmsProductPutTrayCodeList) {
+                wmsProductPutTrayCode1.setWlCode(wmsFpStorageNewsSn1.getWlCode());
+            }
+        }
+
+        return wmsProductPutTrayCodeList;
+    }
+
+    @Override
+    public WmsProductPutTrayCode ScanCodeSingleBox(WmsProductPutTrayCode wmsProductPutTrayCode) {
+        DynamicDataSourceContextHolder.push("ds_" + wmsProductPutTrayCode.getSiteCode());
+        wmsProductPutTrayCode.setRelatStatus("1");
+        //barcode
+        List<WmsProductPutTrayCode>  wmsProductPutTrayCodeList= wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode);
+        //对应的箱码
+        if (wmsProductPutTrayCodeList.size()>0){
+            WmsProductPutTrayCode   wmsProductPutTrayCode1= wmsProductPutTrayCodeList.get(0);
+            wmsProductPutTrayCode.setSn(wmsProductPutTrayCode1.getSn());//托盘
+            WmsFpStorageNewsSn  wmsFpStorageNewsSn=new WmsFpStorageNewsSn();
+            wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn());
+            wmsFpStorageNewsSn.setActiveFlag("1");
+            List<WmsFpStorageNewsSn>    wmsFpStorageNewsSns=   wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn);
+            //库位
+            if(wmsFpStorageNewsSns.size()>0){
+                WmsFpStorageNewsSn  wmsFpStorageNewsSn1=    wmsFpStorageNewsSns.get(0);
+                wmsProductPutTrayCode.setWlCode( wmsFpStorageNewsSn1.getWlCode());//库位
+                return wmsProductPutTrayCode;
+            }
+        }
+        return null;
+    }
+
 }