diff --git a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBill.java b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBill.java
index d47eae1..158731c 100644
--- a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBill.java
+++ b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBill.java
@@ -24,7 +24,7 @@ public class PurchaseInventoryBill extends BaseEntity {
     private String billNo;
     @ApiModelProperty("状态")
     private String billState;
-    @ApiModelProperty("单据类型")
+    @ApiModelProperty("单据类型 0 :采购入库 1 验货入库")
     private String billType;
     @ApiModelProperty("商品总额")
     private BigDecimal total;
diff --git a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillDto2.java b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillDto2.java
index ba457d1..65f200e 100644
--- a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillDto2.java
+++ b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillDto2.java
@@ -58,7 +58,7 @@ public class PurchaseInventoryBillDto2 {
     private String operatorName;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("操作时间")
-    private Date operatorTime;
+    private String operatorTime;
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;
     @ApiModelProperty("创建组织sid")
diff --git a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java
index 55c9f38..2f98236 100644
--- a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java
+++ b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java
@@ -21,6 +21,8 @@ import com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsBillService;
 import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetail;
 import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailService;
 import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsListDetailsVo;
+import com.yxt.warehouse.biz.warehouseinfo.WarehouseInfo;
+import com.yxt.warehouse.biz.warehouseinfo.WarehouseInfoService;
 import com.yxt.warehouse.biz.warehouseinventory.WarehouseInventory;
 import com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryDto;
 import com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryService;
@@ -66,6 +68,8 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
     WarehouseAnsBillService warehouseAnsBillService;
     @Autowired
     WarehouseRackService warehouseRackService;
+    @Autowired
+    WarehouseInfoService warehouseInfoService;
 
     public PagerVo<PurchaseInventoryBillPageVo> listPage(PagerQuery<PurchaseInventoryBillQuery> pq) {
         PurchaseInventoryBillQuery query = pq.getParams();
@@ -137,6 +141,7 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
             }
             wmsReceiptBill.setBillNo(billNo);
             wmsReceiptBill.setTotalQuantity(c);
+            wmsReceiptBill.setBillType("0");
             baseMapper.insert(wmsReceiptBill);
             List<PurchaseInventoryBillDetailDto2> list = dto2.getList();
             list.removeAll(Collections.singleton(null));
@@ -222,6 +227,10 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
         String sid = wmsReceiptBill.getSid();
         BeanUtil.copyProperties(dto, wmsReceiptBill, "sid");
         wmsReceiptBill.setBillState("1");
+        wmsReceiptBill.setBillType("1");
+        wmsReceiptBill.setOperatorName(dto.getUserName());
+        wmsReceiptBill.setOperatorSid(dto.getUserSid());
+        wmsReceiptBill.setOperatorTime(new Date());
         wmsReceiptBill.setTotal(total);
         //生成单据编号
         String billNo = "";
@@ -239,30 +248,44 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
         List<PurchaseInventoryBillDetailDto2> list = dto.getList();
         list.removeAll(Collections.singleton(null));
         for (PurchaseInventoryBillDetailDto2 dto2 : list) {
+            dto2.setSourceBillSid(wmsReceiptBill.getSid());
             purchaseInventoryBillDetailService.saveOrUpdate(dto2);
             WarehouseInventory warehouseInventory=new WarehouseInventory();
             warehouseInventory.setBatchNumber(dto2.getBatch());
-            warehouseInventory.setGoodsSpuName("");
+            warehouseInventory.setGoodsSpuName(dto2.getGoodsSpuName());
             warehouseInventory.setGoodsSkuSid(dto2.getGoodsSkuSid());
             warehouseInventory.setGoodsSkuTitle(dto2.getGoodsSkuTitle());
             warehouseInventory.setGoodsSkuCode(dto2.getGoodsSkuCode());
-            warehouseInventory.setGoodsSkuOwnSpec("");
-            warehouseInventory.setUnit(dto2.getUnit());
+            warehouseInventory.setGoodsSkuOwnSpec(dto2.getOwnSpec());
+            warehouseInventory.setUnit(dto2.getGoodsUnitName());
             warehouseInventory.setCount(dto2.getCount());
             warehouseInventory.setAllocateCount(new BigDecimal(0));
             warehouseInventory.setPickCount(new BigDecimal(0));
             warehouseInventory.setFreezeCount(new BigDecimal(0));
-//            warehouseInventory.setCost(dto2.getPrice());
-            warehouseInventory.setWarehouseSid(dto2.getWarehouseSid());
-            warehouseInventory.setWarehouseName(dto2.getWarehouseName());
+            warehouseInventory.setCost(dto2.getCostPrice());
             warehouseInventory.setWarehouseRackSid(dto2.getWarehouseRackSid());
             WarehouseRack warehouseRack=warehouseRackService.getOne(new QueryWrapper<WarehouseRack>().eq("sid",dto2.getWarehouseRackSid()));
+            warehouseInventory.setWarehouseSid(warehouseRack.getWarehouseSid());
+            WarehouseInfo warehouseInfo=warehouseInfoService.getOne(new QueryWrapper<WarehouseInfo>().eq("sid",warehouseRack.getWarehouseSid()));
+            warehouseInventory.setWarehouseName(warehouseInfo.getWarehouseName());
             warehouseInventory.setWarehouseRackCode(warehouseRack.getRackCode());
+            warehouseInventory.setFirstInDate(new Date());
             warehouseInventory.setUseOrgSid(dto.getUseOrgSid());
             warehouseInventory.setCreateOrgSid(dto.getCreateOrgSid());
+            warehouseInventory.setGoodsSkuOwnSpec(dto2.getSpecValue());
+            warehouseInventory.setGoodsSpuName(dto2.getGoodsSpuName());
+            warehouseInventory.setGoodSpuSid(dto2.getGoodsSpuSid());
+
+            String billNo1 = dto2.getGoodsSkuCode() + date;
+            String b = baseMapper.selectNum(billNo1);
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(b)) {
+                billNo1 = Rule.getBillNo(billNo1, Integer.valueOf(b).intValue());
+            } else {
+                billNo1 = Rule.getBillNo(billNo1, 0);
+            }
+            warehouseInventory.setGoodsID(billNo1);
             warehouseInventoryService.save(warehouseInventory);
         }
-
         OperationRecordDto dto1 = new OperationRecordDto();
         dto1.setBillSid(sid);
         dto1.setUserSid(dto.getUserSid());
@@ -291,7 +314,7 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
             dto2.setExternalNo(warehouseAnsBill.getSourceBillNo());
             dto2.setOperatorSid(dto.getUserSid());
             dto2.setOperatorName(dto.getUserName());
-            dto2.setOperatorTime(new Date());
+            dto2.setOperatorTime(dto.getOperatorTime());
             dto2.setList(groupingMap.get(a));
             dto2.setStorageTime(dto.getStorageTime());
             dto2.setWarehouseName(s.get(0).getWarehouseName());
diff --git a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetail.java b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetail.java
index aa5a77c..e2d64f8 100644
--- a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetail.java
+++ b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetail.java
@@ -36,7 +36,7 @@ public class PurchaseInventoryBillDetail extends BaseEntity {
     @ApiModelProperty("单位")
     private String unit;
     @ApiModelProperty("成本单价")
-    private double price;
+    private BigDecimal price;
     @ApiModelProperty("总价")
     private double totalPrice;
     @ApiModelProperty("数量")
diff --git a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java
index 28fc20a..98e9e0f 100644
--- a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java
+++ b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java
@@ -33,6 +33,7 @@ public class PurchaseInventoryBillDetailDto2 {
     private String goodsBarCode;
     @ApiModelProperty("规格值")
     private String specValue;
+    private String ownSpec;
     @ApiModelProperty("箱条码")
     private String boxBarCode;
     @ApiModelProperty("箱规格")
@@ -40,8 +41,10 @@ public class PurchaseInventoryBillDetailDto2 {
 
     @ApiModelProperty("单位")
     private String unit;
+    private String goodsUnitName;
     @ApiModelProperty("成本单价")
     private BigDecimal price;
+    private BigDecimal costPrice;
     @ApiModelProperty("总价")
     private BigDecimal totalPrice;
     @ApiModelProperty("数量")
diff --git a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java
index 02ee5f5..5449c53 100644
--- a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java
+++ b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java
@@ -104,14 +104,14 @@ public class PurchaseInventoryBillDetailService extends MybatisBaseService<Purch
             warehouseInventory.setGoodsSpuName(v.getGoodsSpuName());
             warehouseInventory.setGoodSpuSid(v.getGoodsSpuSid());
             String date = DateUtil.format(DateUtil.date(), "yyyyMMdd");
-            String billNo = "RK" + date;
+            String billNo = v.getGoodsSkuCode() + date;
             String i = baseMapper.selectNum(billNo);
             if (org.apache.commons.lang3.StringUtils.isNotBlank(i)) {
                 billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
             } else {
                 billNo = Rule.getBillNo(billNo, 0);
             }
-            warehouseInventory.setGoodsID(v.getGoodsSkuCode()+date+billNo);
+            warehouseInventory.setGoodsID(billNo);
             warehouseInventoryService.save(warehouseInventory);
             baseMapper.insert(wmsReceiptBillDetail);
         }
@@ -161,15 +161,24 @@ public class PurchaseInventoryBillDetailService extends MybatisBaseService<Purch
         String sid = "";
         if (StringUtils.isNotBlank(dto.getSid())) {
             sid = dto.getSid();
-            PurchaseInventoryBillDetail wmsWarehouseRack = fetchBySid(dto.getSid());
-            BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
-            baseMapper.updateById(wmsWarehouseRack);
+            PurchaseInventoryBillDetail purchaseInventoryBillDetail = fetchBySid(dto.getSid());
+            BeanUtil.copyProperties(dto, purchaseInventoryBillDetail, "id", "sid");
+            purchaseInventoryBillDetail.setSpecValue(dto.getOwnSpec());
+            purchaseInventoryBillDetail.setUnit(dto.getGoodsUnitName());
+            purchaseInventoryBillDetail.setPrice(dto.getCostPrice());
+            purchaseInventoryBillDetail.setRemarks(dto.getRemarks());
+            baseMapper.updateById(purchaseInventoryBillDetail);
         } else {
-            PurchaseInventoryBillDetail wmsWarehouseRack = new PurchaseInventoryBillDetail();
-            sid = wmsWarehouseRack.getSid();
-            BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
-            wmsWarehouseRack.setCreateTime(new DateTime());
-            baseMapper.insert(wmsWarehouseRack);
+            PurchaseInventoryBillDetail purchaseInventoryBillDetail = new PurchaseInventoryBillDetail();
+            sid = purchaseInventoryBillDetail.getSid();
+            BeanUtil.copyProperties(dto, purchaseInventoryBillDetail, "id", "sid");
+            purchaseInventoryBillDetail.setCreateTime(new DateTime());
+            purchaseInventoryBillDetail.setSid(UUID.randomUUID().toString());
+            purchaseInventoryBillDetail.setSpecValue(dto.getOwnSpec());
+            purchaseInventoryBillDetail.setUnit(dto.getGoodsUnitName());
+            purchaseInventoryBillDetail.setPrice(dto.getCostPrice());
+            purchaseInventoryBillDetail.setRemarks(dto.getRemarks());
+            baseMapper.insert(purchaseInventoryBillDetail);
         }
         return rb.success().setMsg("成功");
     }