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

src/main/java/orthopedics/controller/bookcity/PurOrderHeaderController.java

@@ -354,8 +354,11 @@ public class PurOrderHeaderController {
         if(receiptNumber==null){
         if(receiptNumber==null){
             return new Result(false, StatusCode.ERROR,"接收单号生成错误");
             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.setShipper(sysUser.getPersonId());
 
 
         rcvReceiptHeader.setReceiptNumber(receiptNumber);
         rcvReceiptHeader.setReceiptNumber(receiptNumber);
@@ -382,6 +385,7 @@ public class PurOrderHeaderController {
             }
             }
             rcvReceiptLine.setItemId(purOrderLine.getItemId());
             rcvReceiptLine.setItemId(purOrderLine.getItemId());
             rcvReceiptLine.setAttribute1(purOrderLine.getItemName());
             rcvReceiptLine.setAttribute1(purOrderLine.getItemName());
+            rcvReceiptLine.setAttribute2(purOrderLine.getItemCode());
             int i=0;
             int i=0;
             try {
             try {
                 i = Integer.parseInt(purOrderLine.getQuantity());
                 i = Integer.parseInt(purOrderLine.getQuantity());

src/main/java/orthopedics/controller/bookcity/RcvReceiptController.java

@@ -42,6 +42,8 @@ public class RcvReceiptController {
     private PropertiesServer propertiesServer;
     private PropertiesServer propertiesServer;
     @Autowired
     @Autowired
     private WarDifferentService warDifferentService;
     private WarDifferentService warDifferentService;
+    @Autowired
+    private OrganzitionServer organzitionServer;
 
 
     /*
     /*
      *描述：验收入库前需先进行审核
      *描述：验收入库前需先进行审核
@@ -230,7 +232,11 @@ public class RcvReceiptController {
         warDifferent.setSourceLineNumber(rcvReceiptLine.getLineNumber());
         warDifferent.setSourceLineNumber(rcvReceiptLine.getLineNumber());
         warDifferent.setSourceLineId(rcvReceiptLine.getId());
         warDifferent.setSourceLineId(rcvReceiptLine.getId());
         warDifferent.setSourceType("RCV_RECEIPT");
         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);
         warDifferent.setDifferentType(type);
         String headerId = "";
         String headerId = "";
         if(null != rcvReceiptHeader.getSourceHeaderId() && !"".equals(rcvReceiptHeader.getSourceHeaderId())) {
         if(null != rcvReceiptHeader.getSourceHeaderId() && !"".equals(rcvReceiptHeader.getSourceHeaderId())) {