wms生产领料手持确认接口修改

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

@@ -270,19 +270,31 @@ public class WmsToWCSmissionController {
         return success(result);
     }
 
+//    /**
+//     * 生产领料--新确认出库
+//     *
+//     * @param orderList
+//     * @return
+//     */
+//    @PostMapping("/NewConMaterialOutSCNew")
+//    public AjaxResult NewConMaterialOutSCNew(@RequestParam("orderList") List<OdsProcureOutOrder> orderList,@RequestParam("gzList") List<OdsProcureOutOrder> gzList) {
+//        String result = odsProcureOrderService.NewConMaterialOutSCNew(orderList,gzList);
+//        return success(result);
+//    }
     /**
      * 生产领料--新确认出库
      *
-     * @param orderList
+     * @param odsProcureOutOrder
      * @return
      */
     @PostMapping("/NewConMaterialOutSCNew")
-    public AjaxResult NewConMaterialOutSCNew(@RequestParam("orderList") List<OdsProcureOutOrder> orderList,@RequestParam("gzList") List<OdsProcureOutOrder> gzList) {
+    public AjaxResult NewConMaterialOutSCNew(@RequestBody OdsProcureOutOrder odsProcureOutOrder) {
+        List<OdsProcureOutOrder>    orderList=  odsProcureOutOrder.getOrderList();
+        List<OdsProcureOutOrder>    gzList=  odsProcureOutOrder.getGzList();
         String result = odsProcureOrderService.NewConMaterialOutSCNew(orderList,gzList);
         return success(result);
     }
 
-
     /**
      * 生产领料--托盘数据查询
      *

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

@@ -69,8 +69,27 @@ public class OdsProcureOutOrder extends BaseEntity {
      */
     private String ID;
     List<OdsProcureOutOrder> list;
+    List<OdsProcureOutOrder> orderList;
+    List<OdsProcureOutOrder> gzList;
+
     List<SapMaterialPosting> sapMaterialPostingList;
 
+    public List<OdsProcureOutOrder> getOrderList() {
+        return orderList;
+    }
+
+    public void setOrderList(List<OdsProcureOutOrder> orderList) {
+        this.orderList = orderList;
+    }
+
+    public List<OdsProcureOutOrder> getGzList() {
+        return gzList;
+    }
+
+    public void setGzList(List<OdsProcureOutOrder> gzList) {
+        this.gzList = gzList;
+    }
+
     public List<SapMaterialPosting> getSapMaterialPostingList() {
         return sapMaterialPostingList;
     }

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

@@ -697,6 +697,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	User_Defined5	DESC
 </select>
 <select id="PurchaseOrderOutboundPdafc"	parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
 	SELECT