Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HygfReplenishmentDto.java

@@ -25,7 +25,7 @@ public class HygfReplenishmentDto  extends BaseDto {
     private Long preparationMoneyId;
 
     @ApiModelProperty(value = "补货描述")
-    private String desc;
+    private String comment;
 
     @ApiModelProperty(value = "补货文件")
     private String file;

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HygfReplenishment.java

@@ -34,8 +34,8 @@ public class HygfReplenishment extends BaseEntity {
     /**
      * 补货描述
      */
-	@TableField("desc")
-    private String desc;
+	@TableField("comment")
+    private String comment;
 
     /**
      * 补货文件

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java

@@ -559,7 +559,6 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
 
             //更新电站施工状态
             LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
-            up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.备货中.getCode());
             List<DocumentStation> idsk = model.getPeasantHouseholdId();
             List<Long> idsH = new ArrayList<>();
             for (DocumentStation documentStation : idsk) {
@@ -568,7 +567,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
             up.in(PeasantHousehold::getSequenceNbr, idsH);
             preparationMoneyMapper.insert(model);
             if (isSubmit.equals("0")) {
-                up.set(PeasantHousehold::getPreparationMoneyState, DeliveryStateeEnum.已发货.getCode());
+                up.set(PeasantHousehold::getPreparationMoneyState, ArrivalStateeEnum.待收货.getCode());
+                up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.待收货.getCode());
                 //开启工作流 并执行一步
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                 List<ActWorkflowStartDTO> params = new ArrayList<>();
@@ -594,6 +594,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 model.setDeliveryTime(new Date());
                 model.setOrderStatus(DeliveryStateeEnum.待确认.getName());
             } else {
+                up.set(PeasantHousehold::getConstructionState, DeliveryStateeEnum.暂存发货.getCode());
                 up.set(PeasantHousehold::getPreparationMoneyState, DeliveryStateeEnum.暂存发货.getCode());
                 model.setOrderStatus(DeliveryStateeEnum.待提交.getName());
             }