diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProductEmbryoInventoryController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProductEmbryoInventoryController.java index faafbdb1..4f98ec50 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProductEmbryoInventoryController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProductEmbryoInventoryController.java @@ -90,12 +90,12 @@ public class OdsProductEmbryoInventoryController extends BaseController { } /** * 调整盘点单 - * @param odsProductEmbryoInventoryCorrelationList + * @param odsProductEmbryoInventory * @return */ @PostMapping("/AdjustInventoryList") - public AjaxResult AdjustInventoryList(@RequestBody List odsProductEmbryoInventoryCorrelationList) { - String relust= odsProductEmbryoInventoryService.AdjustInventoryList(odsProductEmbryoInventoryCorrelationList); + public AjaxResult AdjustInventoryList(@RequestBody OdsProductEmbryoInventory odsProductEmbryoInventory) { + String relust= odsProductEmbryoInventoryService.AdjustInventoryList(odsProductEmbryoInventory); return success(relust); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProductEmbryoInventoryService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProductEmbryoInventoryService.java index 3dd19aca..d1c74adf 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProductEmbryoInventoryService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProductEmbryoInventoryService.java @@ -76,5 +76,5 @@ public interface IOdsProductEmbryoInventoryService { List selectObtainTheAssociated(OdsProductEmbryoInventory odsProductEmbryoInventory); - String AdjustInventoryList(List odsProductEmbryoInventoryCorrelationList); + String AdjustInventoryList(OdsProductEmbryoInventory odsProductEmbryoInventory); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProductEmbryoInventoryServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProductEmbryoInventoryServiceImpl.java index d1c8c23a..acea430b 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProductEmbryoInventoryServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProductEmbryoInventoryServiceImpl.java @@ -281,12 +281,12 @@ public class OdsProductEmbryoInventoryServiceImpl implements IOdsProductEmbryoIn @Override @DS("#header.poolName") - public String AdjustInventoryList(List odsProductEmbryoInventoryCorrelationList) { + public String AdjustInventoryList(OdsProductEmbryoInventory odsProductEmbryoInventory) { + List odsProductEmbryoInventoryCorrelationList= odsProductEmbryoInventory.getOdsProductEmbryoInventoryCorrelationList(); String result="调整成功"; OdsProductEmbryoInventory odsProductEmbryoInventory1=new OdsProductEmbryoInventory(); //修改为调整| - OdsProductEmbryoInventoryCorrelation odsProductEmbryoInventoryCorrelation= odsProductEmbryoInventoryCorrelationList.get(0); - odsProductEmbryoInventory1.setOrderCode(odsProductEmbryoInventoryCorrelation.getOrderCode()); + odsProductEmbryoInventory1.setOrderCode(odsProductEmbryoInventory.getOrderCode()); odsProductEmbryoInventory1.setOrderStatus("4");//4是待审核 odsProductEmbryoInventory1.setUserDefined6(SecurityUtils.getUsername()); odsProductEmbryoInventory1.setUserDefined7(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProductEmbryoInventoryMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProductEmbryoInventoryMapper.xml index b4bc964b..2a066f53 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProductEmbryoInventoryMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProductEmbryoInventoryMapper.xml @@ -68,6 +68,8 @@ + + select Site_code, ID, Order_Code, Material_Code, Material_Desc, Plan_Date, Loc_Number, Unit, Reality_Number, Order_Status, User_Defined1, Loc_Code, User_Defined2, User_Defined3, User_Defined4, User_Defined5, User_Defined6, User_Defined7, User_Defined8, User_Defined9, User_Defined10, User_Defined11, Remark, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code from ods_product_embryo_inventory @@ -548,6 +550,7 @@ User_Defined2, User_Defined3, User_Defined4, + User_Defined4 AS adjustmentAmount, User_Defined5, User_Defined6, User_Defined7,