diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index f341c680..663a5271 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/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 orderList,@RequestParam("gzList") List gzList) { +// String result = odsProcureOrderService.NewConMaterialOutSCNew(orderList,gzList); +// return success(result); +// } /** * 生产领料--新确认出库 * - * @param orderList + * @param odsProcureOutOrder * @return */ @PostMapping("/NewConMaterialOutSCNew") - public AjaxResult NewConMaterialOutSCNew(@RequestParam("orderList") List orderList,@RequestParam("gzList") List gzList) { + public AjaxResult NewConMaterialOutSCNew(@RequestBody OdsProcureOutOrder odsProcureOutOrder) { + List orderList= odsProcureOutOrder.getOrderList(); + List gzList= odsProcureOutOrder.getGzList(); String result = odsProcureOrderService.NewConMaterialOutSCNew(orderList,gzList); return success(result); } - /** * 生产领料--托盘数据查询 * diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java index 7fc26536..2a5ce484 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java +++ b/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 list; + List orderList; + List gzList; + List sapMaterialPostingList; + public List getOrderList() { + return orderList; + } + + public void setOrderList(List orderList) { + this.orderList = orderList; + } + + public List getGzList() { + return gzList; + } + + public void setGzList(List gzList) { + this.gzList = gzList; + } + public List getSapMaterialPostingList() { return sapMaterialPostingList; } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml index 007d5331..88f32392 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml @@ -697,6 +697,7 @@ and Enterprise_Id = #{enterpriseId} and Enterprise_Code = #{enterpriseCode} + ORDER BY User_Defined5 DESC