wms成品部分修改30

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

@@ -86,74 +86,7 @@ public class OdsProductEmbryoInventoryController extends BaseController {
     public AjaxResult addOdsProductEmbryoInventory(@RequestBody OdsProductEmbryoInventory odsProductEmbryoInventory) {
         return success(odsProductEmbryoInventoryService.addOdsProductEmbryoInventory(odsProductEmbryoInventory));
     }
-    /**
-     * 查询成品盘点单
-     */
-    /**
-     * 盘点后，如果盘点总数量=盘点单总数量，则状态更新为已完成，如果不等于，则状态更新为待调整；
-     * @param odsProductEmbryoInventory
-     * @return
-     */
-    @PostMapping("/selectOdsProductEmbryoInventory")
-    public AjaxResult selectOdsProductEmbryoInventory(@RequestBody OdsProductEmbryoInventory odsProductEmbryoInventory) {
-        return success(odsProductEmbryoInventoryService.selectOdsProductEmbryoInventory(odsProductEmbryoInventory));
-    }
-    /**
-     * 成品盘点的托盘扫码
-     */
-    /**
-     *
-     * @param odsProductEmbryoInventory
-     * @return
-     */
-    @PostMapping("/selectScanningTray")
-    public AjaxResult selectScanningTray(@RequestBody OdsProductEmbryoInventory odsProductEmbryoInventory) {
-        OdsProductEmbryoInventoryCorrelation    odsProductEmbryoInventoryCorrelation= odsProductEmbryoInventoryService.selectScanningTray(odsProductEmbryoInventory);
-        if (odsProductEmbryoInventoryCorrelation==null){
-            return success("托盘扫码错误");
-        }
-        return success(odsProductEmbryoInventoryCorrelation);
-    }
-    /**
-     * 成品盘点-关联信息确认盘点
-     */
-    /**
-     *
-     * @param odsProductEmbryoInventory
-     * @return
-     */
-    @PostMapping("/confirmInventory")
-    public AjaxResult confirmInventory(@RequestBody OdsProductEmbryoInventory odsProductEmbryoInventory) {
-        String    result= odsProductEmbryoInventoryService.confirmInventory(odsProductEmbryoInventory);
-        return success(result);
-    }
-    /**
-     * 成品盘点-关联信息确--取消盘点
-     */
-    /**
-     *
-     * @param odsProductEmbryoInventory
-     * @return
-     */
-    @PostMapping("/cancelInventory")
-    public AjaxResult cancelInventory(@RequestBody OdsProductEmbryoInventory odsProductEmbryoInventory) {
-        String    result= odsProductEmbryoInventoryService.cancelInventory(odsProductEmbryoInventory);
-        return success(result);
-    }
 
-    /**
-     * 成品盘点---盘点完成确认按钮
-     */
-    /**
-     *盘点后，如果盘点总数量=盘点单总数量，则状态更新为已完成，如果不等于，则状态更新为待调整；
-     * @param odsProductEmbryoInventory
-     * @return
-     */
-    @PostMapping("/confirmCompletion")
-    public AjaxResult confirmCompletion(@RequestBody OdsProductEmbryoInventory odsProductEmbryoInventory) {
-        String    result= odsProductEmbryoInventoryService.confirmCompletion(odsProductEmbryoInventory);
-        return success(result);
-    }
     /**
      * 修改成品盘点单
      */

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

@@ -32,6 +32,8 @@ public class WmsToWCSmissionController {
     private IBaseWarehouseService baseWarehouseService;
     @Autowired
     private IOdsWhiteEmbryoService iOdsWhiteEmbryoService;
+    @Autowired
+    private IOdsProductEmbryoInventoryService odsProductEmbryoInventoryService;
     /**
      * 包材请求入库---
      *
@@ -453,4 +455,88 @@ public class WmsToWCSmissionController {
         String result=    iOdsWhiteEmbryoService.WhiteBilletReturnConfir(wmsOdsEmStorageNewsSn);
         return success(result);
     }
+
+
+
+    /**
+     * 查询成品盘点单
+     */
+    /**
+     * 盘点后，如果盘点总数量=盘点单总数量，则状态更新为已完成，如果不等于，则状态更新为待调整；
+     * @param odsProductEmbryoInventory
+     * @return
+     */
+    @PostMapping("/selectOdsProductEmbryoInventory")
+    public AjaxResult selectOdsProductEmbryoInventory(@RequestBody OdsProductEmbryoInventory odsProductEmbryoInventory) {
+        return success(odsProductEmbryoInventoryService.selectOdsProductEmbryoInventory(odsProductEmbryoInventory));
+    }
+    /**
+     * 成品盘点的托盘扫码
+     */
+    /**
+     *
+     * @param odsProductEmbryoInventory
+     * @return
+     */
+    @PostMapping("/selectScanningTray")
+    public AjaxResult selectScanningTray(@RequestBody OdsProductEmbryoInventory odsProductEmbryoInventory) {
+        OdsProductEmbryoInventoryCorrelation    odsProductEmbryoInventoryCorrelation= odsProductEmbryoInventoryService.selectScanningTray(odsProductEmbryoInventory);
+        if (odsProductEmbryoInventoryCorrelation==null){
+            return success("托盘扫码错误");
+        }
+        return success(odsProductEmbryoInventoryCorrelation);
+    }
+    /**
+     * 成品盘点-关联信息确认盘点
+     */
+    /**
+     *
+     * @param odsProductEmbryoInventory
+     * @return
+     */
+    @PostMapping("/confirmInventory")
+    public AjaxResult confirmInventory(@RequestBody OdsProductEmbryoInventory odsProductEmbryoInventory) {
+        String    result= odsProductEmbryoInventoryService.confirmInventory(odsProductEmbryoInventory);
+        return success(result);
+    }
+    /**
+     * 成品盘点-关联信息确--取消盘点
+     */
+    /**
+     *
+     * @param odsProductEmbryoInventory
+     * @return
+     */
+    @PostMapping("/cancelInventory")
+    public AjaxResult cancelInventory(@RequestBody OdsProductEmbryoInventory odsProductEmbryoInventory) {
+        String    result= odsProductEmbryoInventoryService.cancelInventory(odsProductEmbryoInventory);
+        return success(result);
+    }
+
+    /**
+     * 成品盘点---盘点完成确认按钮
+     */
+    /**
+     *盘点后，如果盘点总数量=盘点单总数量，则状态更新为已完成，如果不等于，则状态更新为待调整；
+     * @param odsProductEmbryoInventory
+     * @return
+     */
+    @PostMapping("/confirmCompletion")
+    public AjaxResult confirmCompletion(@RequestBody OdsProductEmbryoInventory odsProductEmbryoInventory) {
+        String    result= odsProductEmbryoInventoryService.confirmCompletion(odsProductEmbryoInventory);
+        return success(result);
+    }
+    //
+
+    /**
+     * 获取已经盘点的盘点单的关联信息
+     * @param odsProductEmbryoInventory
+     * @return
+     */
+    @PostMapping("/selectOdsProductEmbryoInventoryCorrelation")
+    public AjaxResult selectOdsProductEmbryoInventoryCorrelation(@RequestBody OdsProductEmbryoInventory odsProductEmbryoInventory) {
+        List<OdsProductEmbryoInventoryCorrelation>    odsProductEmbryoInventoryCorrelationList= odsProductEmbryoInventoryService.selectOdsProductEmbryoInventoryCorrelation(odsProductEmbryoInventory);
+        return success(odsProductEmbryoInventoryCorrelationList);
+    }
+
 }

op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProductEmbryoInventoryMapper.java

@@ -63,4 +63,6 @@ public interface OdsProductEmbryoInventoryMapper {
     void insertOdsProductEmbryoInventoryCorrelation(OdsProductEmbryoInventoryCorrelation odsProductEmbryoInventoryCorrelation1);
 
     List<OdsProductEmbryoInventoryCorrelation> selectOdsProductEmbryoInventoryCorrelationList(OdsProductEmbryoInventory odsProductEmbryoInventory2);
+
+    public int updateOdsProductEmbryoInventoryCorrelation(OdsProductEmbryoInventory odsProductEmbryoInventory1);
 }

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

@@ -71,4 +71,6 @@ public interface IOdsProductEmbryoInventoryService {
     String cancelInventory(OdsProductEmbryoInventory odsProductEmbryoInventory);
 
     String confirmCompletion(OdsProductEmbryoInventory odsProductEmbryoInventory);
+
+    List<OdsProductEmbryoInventoryCorrelation> selectOdsProductEmbryoInventoryCorrelation(OdsProductEmbryoInventory odsProductEmbryoInventory);
 }

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

@@ -199,9 +199,9 @@ public class OdsProductEmbryoInventoryServiceImpl implements IOdsProductEmbryoIn
 
         odsProductEmbryoInventory1.setID(odsProductEmbryoInventory.getID());
         odsProductEmbryoInventory1.setOrderStatus("1");
-        odsProductEmbryoInventory1.setUserDefined2(odsProductEmbryoInventory.getUserDefined2());
+       // odsProductEmbryoInventory1.setUserDefined2(odsProductEmbryoInventory.getUserDefined2());
         odsProductEmbryoInventory1.setRealityNumber(odsProductEmbryoInventory.getRealityNumber());
-        odsProductEmbryoInventoryMapper.updateOdsProductEmbryoInventory(odsProductEmbryoInventory1);
+        odsProductEmbryoInventoryMapper.updateOdsProductEmbryoInventoryCorrelation(odsProductEmbryoInventory1);
         return ruslt;
     }
 
@@ -213,9 +213,9 @@ public class OdsProductEmbryoInventoryServiceImpl implements IOdsProductEmbryoIn
 
         odsProductEmbryoInventory1.setID(odsProductEmbryoInventory.getID());
         odsProductEmbryoInventory1.setOrderStatus("0");
-        odsProductEmbryoInventory1.setUserDefined2(odsProductEmbryoInventory.getUserDefined2());
+        //odsProductEmbryoInventory1.setUserDefined2(odsProductEmbryoInventory.getUserDefined2());
         odsProductEmbryoInventory1.setRealityNumber(new BigDecimal("0"));
-        odsProductEmbryoInventoryMapper.updateOdsProductEmbryoInventory(odsProductEmbryoInventory1);
+        odsProductEmbryoInventoryMapper.updateOdsProductEmbryoInventoryCorrelation(odsProductEmbryoInventory1);
         return ruslt;
     }
 
@@ -256,6 +256,17 @@ public class OdsProductEmbryoInventoryServiceImpl implements IOdsProductEmbryoIn
         return ruslt;
     }
 
+    @Override
+    public List<OdsProductEmbryoInventoryCorrelation> selectOdsProductEmbryoInventoryCorrelation(OdsProductEmbryoInventory odsProductEmbryoInventory) {
+        DynamicDataSourceContextHolder.push("ds_" + odsProductEmbryoInventory.getSiteCode());
+        OdsProductEmbryoInventory   odsProductEmbryoInventory1=new  OdsProductEmbryoInventory();
+        odsProductEmbryoInventory1.setOrderStatus("1");
+        odsProductEmbryoInventory1.setOrderCode(odsProductEmbryoInventory.getOrderCode());
+        odsProductEmbryoInventory1.setActive("1");
+        List<OdsProductEmbryoInventoryCorrelation>  odsProductEmbryoInventoryCorrelationList=   odsProductEmbryoInventoryMapper.selectOdsProductEmbryoInventoryCorrelationList(odsProductEmbryoInventory1);
+        return odsProductEmbryoInventoryCorrelationList;
+    }
+
     @DS("#header.poolName")
     private String getPurcode(String factorycode, String orderType) {
 

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

@@ -655,4 +655,97 @@
             </if>
         </where>
     </select>
+    <update id="updateOdsProductEmbryoInventoryCorrelation" parameterType="OdsProductEmbryoInventory">
+        update ods_product_embryo_Inventory_correlation
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="siteCode != null">Site_code =
+                #{siteCode},
+            </if>
+            <if test="orderCode != null">Order_Code =
+                #{orderCode},
+            </if>
+            <if test="materialCode != null">Material_Code =
+                #{materialCode},
+            </if>
+            <if test="materialDesc != null">Material_Desc =
+                #{materialDesc},
+            </if>
+            <if test="planDate != null">Plan_Date =
+                #{planDate},
+            </if>
+            <if test="locNumber != null">Loc_Number =
+                #{locNumber},
+            </if>
+            <if test="Unit != null">Unit =
+                #{Unit},
+            </if>
+            <if test="realityNumber != null">Reality_Number =
+                #{realityNumber},
+            </if>
+            <if test="orderStatus != null">Order_Status =
+                #{orderStatus},
+            </if>
+            <if test="userDefined1 != null">User_Defined1 =
+                #{userDefined1},
+            </if>
+            <if test="locCode != null">Loc_Code =
+                #{locCode},
+            </if>
+            <if test="userDefined2 != null">User_Defined2 =
+                #{userDefined2},
+            </if>
+            <if test="userDefined3 != null">User_Defined3 =
+                #{userDefined3},
+            </if>
+            <if test="userDefined4 != null">User_Defined4 =
+                #{userDefined4},
+            </if>
+            <if test="userDefined5 != null">User_Defined5 =
+                #{userDefined5},
+            </if>
+            <if test="userDefined6 != null">User_Defined6 =
+                #{userDefined6},
+            </if>
+            <if test="userDefined7 != null">User_Defined7 =
+                #{userDefined7},
+            </if>
+            <if test="userDefined8 != null">User_Defined8 =
+                #{userDefined8},
+            </if>
+            <if test="userDefined9 != null">User_Defined9 =
+                #{userDefined9},
+            </if>
+            <if test="userDefined10 != null">User_Defined10 =
+                #{userDefined10},
+            </if>
+            <if test="userDefined11 != null">User_Defined11 =
+                #{userDefined11},
+            </if>
+            <if test="Remark != null">Remark =
+                #{Remark},
+            </if>
+            <if test="createBy != null">Create_By =
+                #{createBy},
+            </if>
+            <if test="createDate != null">Create_Date =
+                #{createDate},
+            </if>
+            <if test="lastUpdateBy != null">Last_Update_By =
+                #{lastUpdateBy},
+            </if>
+            <if test="lastUpdateDate != null">Last_Update_Date =
+                #{lastUpdateDate},
+            </if>
+            <if test="Active != null">Active =
+                #{Active},
+            </if>
+            <if test="enterpriseId != null">Enterprise_Id =
+                #{enterpriseId},
+            </if>
+            <if test="enterpriseCode != null">Enterprise_Code =
+                #{enterpriseCode},
+            </if>
+        </trim>
+        where ID = #{ID}
+    </update>
 </mapper>