diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java index 49af88c5..01d196ac 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java @@ -477,15 +477,12 @@ public class ProductrepairRequestMainServiceImpl implements ProductrepairRequest String itemCode = map.get("itemCode") != null?map.get("itemCode").toString():""; productrepairRequestBomRespVO.setItemCode(itemCode); if(StringUtils.isNotEmpty(productrepairRequestBomRespVO.getItemCode())){ - if(detailbDOMap.get(productrepairRequestBomRespVO.getItemCode()) != null){ + if(detailbDOMap.get(productrepairRequestBomRespVO.getItemCode()) != null) { ProductrepairRequestDetailbDO productrepairRequestDetailbDO = detailbDOMap.get(productrepairRequestBomRespVO.getItemCode()); productrepairRequestBomRespVO = ProductrepairRequestDetailbConvert.INSTANCE.convertRespVO(productrepairRequestDetailbDO); - }else { - productrepairRequestBomRespVO.setQty(BigDecimal.ZERO); } - }else { - productrepairRequestBomRespVO.setQty(BigDecimal.ZERO); } + productrepairRequestBomRespVO.setQty(new BigDecimal(map.get("qty") != null?map.get("qty").toString():"0")); productrepairRequestBomRespVO.setUom(map.get("uom") != null?map.get("uom").toString():""); productrepairRequestBomRespVO.setVersion(map.get("version") != null?map.get("version").toString():""); resultList.add(productrepairRequestBomRespVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java index 41ac564e..3875374a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java @@ -662,12 +662,9 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa if(detailbDOMap.get(productscrapRequestBomRespVO.getItemCode()) != null){ RawscrapRequestDetailDO rawscrapRequestDetailDO = detailbDOMap.get(productscrapRequestBomRespVO.getItemCode()); productscrapRequestBomRespVO = RawscrapRequestDetailConvert.INSTANCE.convertRespVO(rawscrapRequestDetailDO); - }else { - productscrapRequestBomRespVO.setQty(BigDecimal.ZERO); } - }else { - productscrapRequestBomRespVO.setQty(BigDecimal.ZERO); } + productscrapRequestBomRespVO.setQty(new BigDecimal(map.get("qty") != null?map.get("qty").toString():"0")); productscrapRequestBomRespVO.setUom(map.get("uom") != null?map.get("uom").toString():""); productscrapRequestBomRespVO.setVersion(map.get("version") != null?map.get("version").toString():""); resultList.add(productscrapRequestBomRespVO); diff --git a/win-server/src/main/resources/application-test.yaml b/win-server/src/main/resources/application-test.yaml index 07c0a703..6b01402d 100644 --- a/win-server/src/main/resources/application-test.yaml +++ b/win-server/src/main/resources/application-test.yaml @@ -1,5 +1,5 @@ server: - port: 25110 + port: 12080 --- #################### 数据库相关配置 ####################