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 3f1aebaa1..c87ad567d 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 @@ -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); - } /** * 修改成品盘点单 */ 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 062794f36..4a9ccdbc9 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 @@ -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 odsProductEmbryoInventoryCorrelationList= odsProductEmbryoInventoryService.selectOdsProductEmbryoInventoryCorrelation(odsProductEmbryoInventory); + return success(odsProductEmbryoInventoryCorrelationList); + } + } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProductEmbryoInventoryMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProductEmbryoInventoryMapper.java index c9cbf83ec..20247eee0 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProductEmbryoInventoryMapper.java +++ b/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 selectOdsProductEmbryoInventoryCorrelationList(OdsProductEmbryoInventory odsProductEmbryoInventory2); + + public int updateOdsProductEmbryoInventoryCorrelation(OdsProductEmbryoInventory odsProductEmbryoInventory1); } 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 b66113d9f..5d92b172d 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 @@ -71,4 +71,6 @@ public interface IOdsProductEmbryoInventoryService { String cancelInventory(OdsProductEmbryoInventory odsProductEmbryoInventory); String confirmCompletion(OdsProductEmbryoInventory odsProductEmbryoInventory); + + List selectOdsProductEmbryoInventoryCorrelation(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 69e6f3fb1..a54c1b939 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 @@ -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 selectOdsProductEmbryoInventoryCorrelation(OdsProductEmbryoInventory odsProductEmbryoInventory) { + DynamicDataSourceContextHolder.push("ds_" + odsProductEmbryoInventory.getSiteCode()); + OdsProductEmbryoInventory odsProductEmbryoInventory1=new OdsProductEmbryoInventory(); + odsProductEmbryoInventory1.setOrderStatus("1"); + odsProductEmbryoInventory1.setOrderCode(odsProductEmbryoInventory.getOrderCode()); + odsProductEmbryoInventory1.setActive("1"); + List odsProductEmbryoInventoryCorrelationList= odsProductEmbryoInventoryMapper.selectOdsProductEmbryoInventoryCorrelationList(odsProductEmbryoInventory1); + return odsProductEmbryoInventoryCorrelationList; + } + @DS("#header.poolName") private String getPurcode(String factorycode, String orderType) { 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 62f8f57b7..42eb0fb56 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 @@ -655,4 +655,97 @@ + + update ods_product_embryo_Inventory_correlation + + Site_code = + #{siteCode}, + + Order_Code = + #{orderCode}, + + Material_Code = + #{materialCode}, + + Material_Desc = + #{materialDesc}, + + Plan_Date = + #{planDate}, + + Loc_Number = + #{locNumber}, + + Unit = + #{Unit}, + + Reality_Number = + #{realityNumber}, + + Order_Status = + #{orderStatus}, + + User_Defined1 = + #{userDefined1}, + + Loc_Code = + #{locCode}, + + User_Defined2 = + #{userDefined2}, + + User_Defined3 = + #{userDefined3}, + + User_Defined4 = + #{userDefined4}, + + User_Defined5 = + #{userDefined5}, + + User_Defined6 = + #{userDefined6}, + + User_Defined7 = + #{userDefined7}, + + User_Defined8 = + #{userDefined8}, + + User_Defined9 = + #{userDefined9}, + + User_Defined10 = + #{userDefined10}, + + User_Defined11 = + #{userDefined11}, + + Remark = + #{Remark}, + + Create_By = + #{createBy}, + + Create_Date = + #{createDate}, + + Last_Update_By = + #{lastUpdateBy}, + + Last_Update_Date = + #{lastUpdateDate}, + + Active = + #{Active}, + + Enterprise_Id = + #{enterpriseId}, + + Enterprise_Code = + #{enterpriseCode}, + + + where ID = #{ID} +