修改发货单操作日志

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

@@ -228,6 +228,9 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
         String result = String.valueOf(kv.get("approvalStatus"));
         boolean flag = true;
         if (PowerStationNodeEnum.设计上传图纸.getCode().equals(nodeCode)||PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
+
+            powerStation.setProcessStatus(PowerStationProcessStateEnum.通过.getName());
+
             this.updateSeve(nodeCode,powerStation.getPeasantHouseholdId(),kv);
         }  else {
 

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

@@ -409,7 +409,12 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
             }else{
                 PreparationMoneyLog preparationMoneyLog2 = new PreparationMoneyLog();
                 preparationMoneyLog2.setPreparationMoneyId(model.getSequenceNbr());
-                preparationMoneyLog2.setOperationContent(PreparationEnum.编辑货单.getCode());
+                if(model.getDeliveryFile()!=null&&!model.getDeliveryFile().isEmpty()){
+                    preparationMoneyLog2.setOperationContent(PreparationEnum.确认发货.getCode());
+                }else{
+                    preparationMoneyLog2.setOperationContent(PreparationEnum.编辑货单.getCode());
+                }
+
                 preparationMoneyLog2.setExecutionTime(new Date());
                 preparationMoneyLog2.setExecutor(agencyUserModel.getRealName());
                 preparationMoneyLogService.save(preparationMoneyLog2);