Commit 3a9c48c6 authored by 季圣华's avatar 季圣华
Browse files

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

parent c75e2224
......@@ -213,18 +213,21 @@ 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", diEx.getPurchaseDecimal()); //采购价
item.put("unitPrice", diEx.getUnitPrice());
item.put("taxUnitPrice", diEx.getTaxUnitPrice());
item.put("allPrice", diEx.getAllPrice());
if("basic".equals(linkType)) {
//正常情况显示金额,而以销定购的情况不能显示金额
item.put("unitPrice", diEx.getUnitPrice());
item.put("taxUnitPrice", diEx.getTaxUnitPrice());
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("linkId", diEx.getLinkId());
item.put("depotId", diEx.getDepotId() == null ? "" : diEx.getDepotId());
item.put("depotName", diEx.getDepotId() == null ? "" : diEx.getDepotName());
item.put("anotherDepotId", diEx.getAnotherDepotId() == null ? "" : diEx.getAnotherDepotId());
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("op", 1);
dataArray.add(item);
......
......@@ -150,8 +150,15 @@ public class DepotHeadService {
if(dh.getOperTime() != null) {
dh.setOperTimeStr(getCenternTime(dh.getOperTime()));
}
//商品信息简述
dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
//商品总数量
dh.setMaterialCount(getMaterialCountByHeaderId(dh.getId()));
//以销定购的情况(不能显示销售单据的金额)
if(StringUtil.isNotEmpty(purchaseStatus)) {
dh.setTotalPrice(null);
dh.setDiscountLastMoney(null);
}
resList.add(dh);
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment