Commit 7e2cbf53 by ice

修改下推采购订单的库存现有量填充,收货成接收单接收人填充的

parent cd063f1e
......@@ -354,8 +354,11 @@ public class PurOrderHeaderController {
if(receiptNumber==null){
return new Result(false, StatusCode.ERROR,"接收单号生成错误");
}
rcvReceiptHeader.setReceiver(sysUser.getId());
SysUser user = userServer.getSysUserById(purOrderHeader.getBuyerId());
if(null != user){
rcvReceiptHeader.setReceiver(user.getPersonId());
}
rcvReceiptHeader.setReceiver("");
rcvReceiptHeader.setShipper(sysUser.getPersonId());
rcvReceiptHeader.setReceiptNumber(receiptNumber);
......@@ -382,6 +385,7 @@ public class PurOrderHeaderController {
}
rcvReceiptLine.setItemId(purOrderLine.getItemId());
rcvReceiptLine.setAttribute1(purOrderLine.getItemName());
rcvReceiptLine.setAttribute2(purOrderLine.getItemCode());
int i=0;
try {
i = Integer.parseInt(purOrderLine.getQuantity());
......
......@@ -42,6 +42,8 @@ public class RcvReceiptController {
private PropertiesServer propertiesServer;
@Autowired
private WarDifferentService warDifferentService;
@Autowired
private OrganzitionServer organzitionServer;
/*
*描述:验收入库前需先进行审核
......@@ -230,7 +232,11 @@ public class RcvReceiptController {
warDifferent.setSourceLineNumber(rcvReceiptLine.getLineNumber());
warDifferent.setSourceLineId(rcvReceiptLine.getId());
warDifferent.setSourceType("RCV_RECEIPT");
warDifferent.setOrgId("964daee94b604cd58e5e6bf48dd9670a");
HrOrganization hrOrganization = organzitionServer.selectByOrgCode(rcvReceiptHeader.getSysOrgCode());
if(hrOrganization != null){
warDifferent.setOrgId(hrOrganization.getId());
}
warDifferent.setOrgId("");
warDifferent.setDifferentType(type);
String headerId = "";
if(null != rcvReceiptHeader.getSourceHeaderId() && !"".equals(rcvReceiptHeader.getSourceHeaderId())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment