purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

从采购订单关联销售订单时，隐藏掉销售单据的价格

Browse Source
This commit is contained in:
季圣华
2022-10-19 23:30:38 +08:00
parent c75e2224a5
commit 3a9c48c6ec
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -213,18 +213,21 @@ public class DepotItemController {
item.put("preNumber", diEx.getOperNumber()); //原数量 item.put("preNumber", diEx.getOperNumber()); //原数量
item.put("finishNumber", depotItemService.getFinishNumber(diEx.getMaterialExtendId(), diEx.getId(), diEx.getHeaderId(), unitInfo, materialUnit, linkType)); //已入库|已出库 item.put("finishNumber", depotItemService.getFinishNumber(diEx.getMaterialExtendId(), diEx.getId(), diEx.getHeaderId(), unitInfo, materialUnit, linkType)); //已入库|已出库
item.put("purchaseDecimal", diEx.getPurchaseDecimal()); //采购价 item.put("purchaseDecimal", diEx.getPurchaseDecimal()); //采购价
if("basic".equals(linkType)) {
//正常情况显示金额，而以销定购的情况不能显示金额
item.put("unitPrice", diEx.getUnitPrice()); item.put("unitPrice", diEx.getUnitPrice());
item.put("taxUnitPrice", diEx.getTaxUnitPrice()); item.put("taxUnitPrice", diEx.getTaxUnitPrice());
item.put("allPrice", diEx.getAllPrice()); item.put("allPrice", diEx.getAllPrice());
item.put("taxRate", diEx.getTaxRate());
item.put("taxMoney", diEx.getTaxMoney());
item.put("taxLastMoney", diEx.getTaxLastMoney());
}
item.put("remark", diEx.getRemark()); item.put("remark", diEx.getRemark());
item.put("linkId", diEx.getLinkId()); item.put("linkId", diEx.getLinkId());
item.put("depotId", diEx.getDepotId() == null ? "" : diEx.getDepotId()); item.put("depotId", diEx.getDepotId() == null ? "" : diEx.getDepotId());
item.put("depotName", diEx.getDepotId() == null ? "" : diEx.getDepotName()); item.put("depotName", diEx.getDepotId() == null ? "" : diEx.getDepotName());
item.put("anotherDepotId", diEx.getAnotherDepotId() == null ? "" : diEx.getAnotherDepotId()); item.put("anotherDepotId", diEx.getAnotherDepotId() == null ? "" : diEx.getAnotherDepotId());
item.put("anotherDepotName", diEx.getAnotherDepotId() == null ? "" : diEx.getAnotherDepotName()); item.put("anotherDepotName", diEx.getAnotherDepotId() == null ? "" : diEx.getAnotherDepotName());
item.put("taxRate", diEx.getTaxRate());
item.put("taxMoney", diEx.getTaxMoney());
item.put("taxLastMoney", diEx.getTaxLastMoney());
item.put("mType", diEx.getMaterialType()); item.put("mType", diEx.getMaterialType());
item.put("op", 1); item.put("op", 1);
dataArray.add(item); dataArray.add(item);

7
jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -150,8 +150,15 @@ public class DepotHeadService {
if(dh.getOperTime() != null) { if(dh.getOperTime() != null) {
dh.setOperTimeStr(getCenternTime(dh.getOperTime())); dh.setOperTimeStr(getCenternTime(dh.getOperTime()));
} }
//商品信息简述
dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId())); dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
//商品总数量
dh.setMaterialCount(getMaterialCountByHeaderId(dh.getId())); dh.setMaterialCount(getMaterialCountByHeaderId(dh.getId()));
//以销定购的情况（不能显示销售单据的金额）
if(StringUtil.isNotEmpty(purchaseStatus)) {
dh.setTotalPrice(null);
dh.setDiscountLastMoney(null);
}
resList.add(dh); resList.add(dh);
} }
} }