采购订单

src/main/java/com/dk/mdm/model/response/pur/PurchaseItemResponse.java

@@ -54,6 +54,21 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     @ApiModelProperty(value = "片")
     private  BigDecimal piece;
 
+    /**
+     * 仓库
+     */
+    @Excel(name = "仓库")
+    @ApiModelProperty(value = "仓库ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String whId;
+
+    /**
+     * 收货仓库
+     */
+    @ApiModelProperty(value = "收货仓库")
+    private String whName;
+
+
     @ApiModelProperty(value = "基本单位")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String unitId;

src/main/java/com/dk/mdm/service/mst/CustomerService.java

@@ -152,7 +152,7 @@ public class CustomerService extends BaseService<Customer> {
         //报备日期
         customer.setReportTime(LocalDateTime.now());
         // 如果有初始欠款，那么就是成交状态
-        if(customerVO.getStartAmount().compareTo(BigDecimal.ZERO) != 0){
+        if(customerVO != null && customerVO.getStartAmount() != null && customerVO.getStartAmount().compareTo(BigDecimal.ZERO) != 0){
             customer.setSaleStatus(Constant.SaleStatus.CHENGJIAO.getName());
         }
         ResponseResultVO<?> insert = super.insert(customer);

src/main/java/com/dk/mdm/service/pur/PurchaseService.java

@@ -324,6 +324,8 @@ public class PurchaseService extends BaseService<Purchase> {
         List<PurchaseItemResponse> purchaseItemResponses = purchaseItemMapper.selectByCond(new PurchaseItemQuery().setPurId(purId));
         for (PurchaseItemResponse item : purchaseItemResponses) {
             item.setPurNo(purchaseResponse.getPurNo());
+            item.setWhId(purchaseResponse.getWhId());
+            item.setWhName(purchaseResponse.getWhName());
         }
         purchaseResponse.setPurchaseItemResponseList(purchaseItemResponses);
         return ResponseResultUtil.success(purchaseResponse);