Merge remote-tracking branch 'origin/master'

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

@@ -334,8 +334,8 @@ public class WmsToWCSmissionController {
      *
      */
     @PostMapping("/selectFinishedProductTransferAndOutbound")
-    public AjaxResult selectFinishedProductTransferAndOutbound(@RequestBody WmsRuturnPutEmbryo wmsRuturnPutEmbryo) {
-        return AjaxResult.success(wmsProductPutService.FinishedProductSalesReturnConfirm(wmsRuturnPutEmbryo));
+    public AjaxResult selectFinishedProductTransferAndOutbound(@RequestBody WmsAllocationOutEmbryo wmsRuturnPutEmbryo) {
+        return AjaxResult.success(wmsProductPutService.selectFinishedProductTransferAndOutbound(wmsRuturnPutEmbryo));
     }
 
 

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

@@ -0,0 +1,15 @@
+package com.op.wms.domain;
+
+import com.op.common.core.web.domain.BaseEntity;
+
+/**
+ * 成品调拨单
+ */
+public class WmsAllocationOutEmbryo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private String id;
+}

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

@@ -117,4 +117,7 @@ public interface IWmsProductPutService {
      * @return
      */
     String FinishedProductSalesReturnConfirm(WmsRuturnPutEmbryo wmsRuturnPutEmbryo);
+
+
+    List<WmsAllocationOutEmbryo> selectFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsRuturnPutEmbryo);
 }

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

@@ -883,4 +883,11 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         }
         return SUCCESS;
     }
+
+    @Override
+    public List<WmsAllocationOutEmbryo> selectFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsRuturnPutEmbryo) {
+
+
+        return null;
+    }
 }