Merge branch 'master_after20' into master_cj_zq

# Conflicts:
#	xingyun-sc/src/main/java/com/lframework/xingyun/sc/handlers/BusinessDataHandlerServiceImpl.java

@@ -63,13 +63,13 @@ public class GetCustomerDevelopPlanBo extends BaseBo<CustomerDevelopPlan> implem
      * 月用量
      */
     @ApiModelProperty("月用量")
-    private Double monthlyUsage;
+    private String monthlyUsage;
 
     /**
      * 目标量
      */
     @ApiModelProperty("目标量")
-    private Double targetQuantity;
+    private String targetQuantity;
 
     /**
      * 行业
@@ -87,13 +87,13 @@ public class GetCustomerDevelopPlanBo extends BaseBo<CustomerDevelopPlan> implem
      * 厚度
      */
     @ApiModelProperty("厚度")
-    private Double thickness;
+    private String thickness;
 
     /**
      * 宽度
      */
     @ApiModelProperty("宽度")
-    private Double width;
+    private String width;
 
     /**
      * 材质要求
@@ -123,7 +123,7 @@ public class GetCustomerDevelopPlanBo extends BaseBo<CustomerDevelopPlan> implem
      * 结算天数
      */
     @ApiModelProperty("结算天数")
-    private Double settleDays;
+    private String settleDays;
 
     /**
      * 责任人ID

@@ -72,12 +72,12 @@ public class CustomerDevelopPlan extends BaseEntity implements BaseDto {
     /**
      * 月用量
      */
-    private Double monthlyUsage;
+    private String monthlyUsage;
 
     /**
      * 目标量
      */
-    private Double targetQuantity;
+    private String targetQuantity;
 
     /**
      * 行业
@@ -92,12 +92,12 @@ public class CustomerDevelopPlan extends BaseEntity implements BaseDto {
     /**
      * 厚度
      */
-    private Double thickness;
+    private String thickness;
 
     /**
      * 宽度
      */
-    private Double width;
+    private String width;
 
     /**
      * 材质要求
@@ -122,7 +122,7 @@ public class CustomerDevelopPlan extends BaseEntity implements BaseDto {
     /**
      * 结算天数
      */
-    private Double settleDays;
+    private String settleDays;
 
     /**
      * 责任人ID

@@ -48,13 +48,13 @@ public class CustomerDevelopExportModel extends BaseBo<GetCustomerDevelopPlanBo>
      * 月用量
      */
     @ExcelProperty("月用量")
-    private Double monthlyUsage;
+    private String monthlyUsage;
 
     /**
      * 目标量
      */
     @ExcelProperty("目标量")
-    private Double targetQuantity;
+    private String targetQuantity;
 
     /**
      * 行业
@@ -72,13 +72,13 @@ public class CustomerDevelopExportModel extends BaseBo<GetCustomerDevelopPlanBo>
      * 厚度
      */
     @ExcelProperty("厚度")
-    private Double thickness;
+    private String thickness;
 
     /**
      * 宽度
      */
     @ExcelProperty("宽度")
-    private Double width;
+    private String width;
 
     /**
      * 材质要求
@@ -108,7 +108,7 @@ public class CustomerDevelopExportModel extends BaseBo<GetCustomerDevelopPlanBo>
      * 结算天数
      */
     @ExcelProperty("结算天数")
-    private Double settleDays;
+    private String settleDays;
 
     /**
      * 责任人

@@ -25,6 +25,7 @@ import com.lframework.xingyun.sc.service.customer.CustomerDevelopPlanService;
 import com.lframework.xingyun.sc.service.ledger.FundCoordinationService;
 import com.lframework.xingyun.sc.service.order.*;
 import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderService;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.car.CarRequestPlanService;
 import com.lframework.xingyun.sc.service.shipments.car.RequestCarTicketService;
@@ -114,6 +115,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     private SysUserRoleService sysUserRoleService;
     @Resource
     private FundCoordinationService fundCoordinationService;
+    @Resource
+    private ShipmentsOrderInfoService shipmentsOrderInfoService;
 
 
 
@@ -566,6 +569,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             String loadingTime = minTime.format(formatter);
             ticketVo.setLoadingTime(loadingTime);
             redisHandler.del("GET_SHIPMENTS_ORDER_ID_" + draftRequestCarTicket.getId());
+            // 更新订货单状态（草稿转为正常）
+            shipmentsOrderInfoService.updateStatus(ticketVo.getShipmentsOrderId(), "UN_SHIPMENTS");
         }
         return ticketVo;
     }

@@ -180,10 +180,10 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
         if (!StringUtil.isBlank(vo.getProductVarietyId())) {
             data.setProductVarietyId(vo.getProductVarietyId());
         }
-        if (vo.getMonthlyUsage() != null) {
+        if (StringUtils.isNotBlank(vo.getMonthlyUsage())) {
             data.setMonthlyUsage(vo.getMonthlyUsage());
         }
-        if (vo.getTargetQuantity() != null) {
+        if (StringUtils.isNotBlank(vo.getTargetQuantity())) {
             data.setTargetQuantity(vo.getTargetQuantity());
         }
         if (!StringUtil.isBlank(vo.getIndustry())) {
@@ -192,10 +192,10 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
         if (!StringUtil.isBlank(vo.getMark())) {
             data.setMark(vo.getMark());
         }
-        if (vo.getThickness() != null) {
+        if (StringUtils.isNotBlank(vo.getThickness())) {
             data.setThickness(vo.getThickness());
         }
-        if (vo.getWidth() != null) {
+        if (StringUtils.isNotBlank(vo.getWidth())) {
             data.setWidth(vo.getWidth());
         }
         if (!StringUtil.isBlank(vo.getMaterialRequire())) {
@@ -210,7 +210,7 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
         if (!StringUtil.isBlank(vo.getPricingMode())) {
             data.setPricingMode(vo.getPricingMode());
         }
-        if (vo.getSettleDays() != null) {
+        if (StringUtils.isNotBlank(vo.getSettleDays())) {
             data.setSettleDays(vo.getSettleDays());
         }
         data.setChargeUserId(vo.getChargeUserId());
@@ -269,17 +269,17 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
                 .set(CustomerDevelopPlan::getOfficeId, StringUtil.isBlank(vo.getOfficeId()) ? null : vo.getOfficeId())
                 .set(CustomerDevelopPlan::getCustomerType, StringUtil.isBlank(vo.getCustomerType()) ? null : vo.getCustomerType())
                 .set(CustomerDevelopPlan::getProductVarietyId, StringUtil.isBlank(vo.getProductVarietyId()) ? null : vo.getProductVarietyId())
-                .set(CustomerDevelopPlan::getMonthlyUsage, vo.getMonthlyUsage() == null ? null : vo.getMonthlyUsage())
-                .set(CustomerDevelopPlan::getTargetQuantity, vo.getTargetQuantity() == null ? null : vo.getTargetQuantity())
+                .set(CustomerDevelopPlan::getMonthlyUsage, StringUtils.isBlank(vo.getMonthlyUsage()) ? null : vo.getMonthlyUsage())
+                .set(CustomerDevelopPlan::getTargetQuantity, StringUtils.isBlank(vo.getTargetQuantity()) ? null : vo.getTargetQuantity())
                 .set(CustomerDevelopPlan::getIndustry, StringUtil.isBlank(vo.getIndustry()) ? null : vo.getIndustry())
                 .set(CustomerDevelopPlan::getMark, StringUtil.isBlank(vo.getMark()) ? null : vo.getMark())
-                .set(CustomerDevelopPlan::getThickness, vo.getThickness() == null ? null : vo.getThickness())
-                .set(CustomerDevelopPlan::getWidth, vo.getWidth() == null ? null : vo.getWidth())
+                .set(CustomerDevelopPlan::getThickness, StringUtils.isBlank(vo.getThickness()) ? null : vo.getThickness())
+                .set(CustomerDevelopPlan::getWidth, StringUtils.isBlank(vo.getWidth()) ? null : vo.getWidth())
                 .set(CustomerDevelopPlan::getMaterialRequire, StringUtil.isBlank(vo.getMaterialRequire()) ? null : vo.getMaterialRequire())
                 .set(CustomerDevelopPlan::getQualityRequire, StringUtil.isBlank(vo.getQualityRequire()) ? null : vo.getQualityRequire())
                 .set(CustomerDevelopPlan::getPeer, StringUtil.isBlank(vo.getPeer()) ? null : vo.getPeer())
                 .set(CustomerDevelopPlan::getPricingMode, StringUtil.isBlank(vo.getPricingMode()) ? null : vo.getPricingMode())
-                .set(CustomerDevelopPlan::getSettleDays, vo.getSettleDays() == null ? null : vo.getSettleDays())
+                .set(CustomerDevelopPlan::getSettleDays, StringUtils.isBlank(vo.getSettleDays()) ? null : vo.getSettleDays())
                 .set(CustomerDevelopPlan::getChargeUserId, vo.getChargeUserId())
                 .set(CustomerDevelopPlan::getStatus, CustomerDevelopStatus.AUDIT)
                 .set(CustomerDevelopPlan::getFlowInstanceId, instance.getId())

@@ -41,7 +41,6 @@ import com.lframework.xingyun.sc.vo.shipments.car.CreateDraftRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.order.*;
 import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
-import com.lframework.xingyun.sc.vo.shipments.plan.UpdateShipmentsPlanDetailVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -325,7 +324,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 list.add(detail);
             }
             if (MapUtils.isEmpty(detailMap)) {
-                throw new DefaultClientException("发货明细数据不存在或存在需要手动发货的数据！");
+                throw new DefaultClientException("不存在可以自动发货的数据！");
             }
             // todo 如果客户很多，则此处需要优化
             for (Map.Entry<String, List<ShipmentsPlanDetail>> entry : detailMap.entrySet()) {
@@ -714,6 +713,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 //如果是空表示由系统自动发起
                 messageDto.setCreateUserId(null);
                 mqProducerService.createSysSiteMessage(messageDto);
+                // 更新发货单状态为草稿
+                updateStatus(shipmentsOrderId, "DRAFT");
                 break;
             }
             if ("PASS".equals(draftTicket.getStatus())) {

@@ -223,8 +223,8 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         List<SysRole> roleList = sysRoleService.listByIds(roleIds);
         for (SysRole role : roleList) {
             String code = role.getCode();
-            if ("ywy".equals(code)) {
-                userIds = sysUserDeptService.listAllUserByUserId(Collections.singletonList(currentUserId), false);
+            if ("ywy".equals(code) || "bsczg".equals(code) || "bscnq".equals(code) || "qyfzr".equals(code)) {
+                userIds = sysUserDeptService.listAllUserByUserId(Collections.singletonList(currentUserId), true);
                 break;
             }
         }

@@ -56,14 +56,14 @@ public class CreateCustomerDevelopPlanVo implements BaseVo, Serializable {
      */
     @ApiModelProperty("月用量")
     @TypeMismatch(message = "月用量格式有误！")
-    private Double monthlyUsage;
+    private String monthlyUsage;
 
     /**
      * 目标量
      */
     @ApiModelProperty("目标量")
     @TypeMismatch(message = "目标量格式有误！")
-    private Double targetQuantity;
+    private String targetQuantity;
 
     /**
      * 行业
@@ -84,14 +84,14 @@ public class CreateCustomerDevelopPlanVo implements BaseVo, Serializable {
      */
     @ApiModelProperty("厚度")
     @TypeMismatch(message = "厚度格式有误！")
-    private Double thickness;
+    private String thickness;
 
     /**
      * 宽度
      */
     @ApiModelProperty("宽度")
     @TypeMismatch(message = "宽度格式有误！")
-    private Double width;
+    private String width;
 
     /**
      * 材质要求
@@ -126,7 +126,7 @@ public class CreateCustomerDevelopPlanVo implements BaseVo, Serializable {
      */
     @ApiModelProperty("结算天数")
     @TypeMismatch(message = "结算天数格式有误！")
-    private Double settleDays;
+    private String settleDays;
 
     /**
      * 责任人ID

@@ -63,14 +63,14 @@ public class UpdateCustomerDevelopPlanVo implements BaseVo, Serializable {
      */
     @ApiModelProperty("月用量")
     @TypeMismatch(message = "月用量格式有误！")
-    private Double monthlyUsage;
+    private String monthlyUsage;
 
     /**
      * 目标量
      */
     @ApiModelProperty("目标量")
     @TypeMismatch(message = "目标量格式有误！")
-    private Double targetQuantity;
+    private String targetQuantity;
 
     /**
      * 行业
@@ -91,14 +91,14 @@ public class UpdateCustomerDevelopPlanVo implements BaseVo, Serializable {
      */
     @ApiModelProperty("厚度")
     @TypeMismatch(message = "厚度格式有误！")
-    private Double thickness;
+    private String thickness;
 
     /**
      * 宽度
      */
     @ApiModelProperty("宽度")
     @TypeMismatch(message = "宽度格式有误！")
-    private Double width;
+    private String width;
 
     /**
      * 材质要求
@@ -133,7 +133,7 @@ public class UpdateCustomerDevelopPlanVo implements BaseVo, Serializable {
      */
     @ApiModelProperty("结算天数")
     @TypeMismatch(message = "结算天数格式有误！")
-    private Double settleDays;
+    private String settleDays;
 
     /**
      * 责任人ID

@@ -49,6 +49,7 @@
     <select id="query" resultMap="ShipmentsOrderInfo">
         <include refid="ShipmentsOrderInfo_sql"/>
         <where>
+            AND tb.status != 'DRAFT'
             <if test="vo.workshopId != null and vo.workshopId != ''">
                 AND tb.workshop_id = #{vo.workshopId}
             </if>