diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java index 6353b248..cb185cbe 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -246,7 +246,7 @@ public class DepotItemController { item.put("preNumber", diEx.getOperNumber()); //原数量 item.put("finishNumber", depotItemService.getFinishNumber(diEx.getMaterialExtendId(), diEx.getId(), diEx.getHeaderId(), unitInfo, materialUnit, linkType)); //已入库|已出库 item.put("purchaseDecimal", roleService.parseBillPriceByLimit(diEx.getPurchaseDecimal(), billCategory, priceLimit, request)); //采购价 - if("basic".equals(linkType)) { + if("basic".equals(linkType) || "1".equals(isReadOnly)) { //正常情况显示金额,而以销定购的情况不能显示金额 item.put("unitPrice", roleService.parseBillPriceByLimit(diEx.getUnitPrice(), billCategory, priceLimit, request)); item.put("taxUnitPrice", roleService.parseBillPriceByLimit(diEx.getTaxUnitPrice(), billCategory, priceLimit, request)); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index bc20709c..f4d38930 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -1046,7 +1046,7 @@ public class DepotItemService { || BusinessConstants.SUB_TYPE_SALES_RETURN.equals(depotHead.getSubType())) { goToType = BusinessConstants.SUB_TYPE_OTHER; } - } else { + } else if("basic".equals(linkType)) { //采购订单转采购入库 if(BusinessConstants.SUB_TYPE_PURCHASE_ORDER.equals(depotHead.getSubType())) { goToType = BusinessConstants.SUB_TYPE_PURCHASE;