wms成品部分修改38

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<OdsProductEmbryoInventoryCorrelation> odsProductEmbryoInventoryCorrelationList) {
+    public AjaxResult AdjustInventoryList(@RequestBody OdsProductEmbryoInventory odsProductEmbryoInventory) {
-        String     relust= odsProductEmbryoInventoryService.AdjustInventoryList(odsProductEmbryoInventoryCorrelationList);
+        String     relust= odsProductEmbryoInventoryService.AdjustInventoryList(odsProductEmbryoInventory);
         return success(relust);
     }
 

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

@@ -76,5 +76,5 @@ public interface IOdsProductEmbryoInventoryService {
 
     List<OdsProductEmbryoInventoryCorrelation> selectObtainTheAssociated(OdsProductEmbryoInventory odsProductEmbryoInventory);
 
-    String AdjustInventoryList(List<OdsProductEmbryoInventoryCorrelation> odsProductEmbryoInventoryCorrelationList);
+    String AdjustInventoryList(OdsProductEmbryoInventory odsProductEmbryoInventory);
 }

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<OdsProductEmbryoInventoryCorrelation> odsProductEmbryoInventoryCorrelationList) {
+    public String AdjustInventoryList(OdsProductEmbryoInventory odsProductEmbryoInventory) {
+        List<OdsProductEmbryoInventoryCorrelation>  odsProductEmbryoInventoryCorrelationList= odsProductEmbryoInventory.getOdsProductEmbryoInventoryCorrelationList();
         String  result="调整成功";
         OdsProductEmbryoInventory   odsProductEmbryoInventory1=new  OdsProductEmbryoInventory();
         //修改为调整|
-        OdsProductEmbryoInventoryCorrelation    odsProductEmbryoInventoryCorrelation=   odsProductEmbryoInventoryCorrelationList.get(0);
+        odsProductEmbryoInventory1.setOrderCode(odsProductEmbryoInventory.getOrderCode());
-        odsProductEmbryoInventory1.setOrderCode(odsProductEmbryoInventoryCorrelation.getOrderCode());
         odsProductEmbryoInventory1.setOrderStatus("4");//4是待审核
         odsProductEmbryoInventory1.setUserDefined6(SecurityUtils.getUsername());
         odsProductEmbryoInventory1.setUserDefined7(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));

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

@@ -68,6 +68,8 @@
         <result property="Active" column="Active"/>
         <result property="enterpriseId" column="Enterprise_Id"/>
         <result property="enterpriseCode" column="Enterprise_Code"/>
+        <result property="adjustmentAmount" column="adjustmentAmount"/>
+
     </resultMap>
     <sql id="selectOdsProductEmbryoInventoryVo">
 		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,