修复发货流程

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

@@ -150,7 +150,7 @@ public class PreparationMoney extends BaseEntity {
     private List<PreparationMoneyLog> preparationMoneyLog;  //发货单流水
 
     @TableField(exist = false)
-    private String instance_id;  //发货单流水
+    private String instanceId;  //发货单流水
     //订单状态
     @TableField("order_status")
     private String orderStatus;

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PreparationMoneyController.java

@@ -256,7 +256,7 @@ public class PreparationMoneyController extends BaseController {
 	@PostMapping(value = "/uploadVoucher")
 	@ApiOperation(httpMethod = "POST",value = "上传收获凭证",  notes = "上传收获凭证")
 	@GlobalTransactional
-	public ResponseModel uploadVoucher(@RequestParam(value = "instanceId") String instanceId,PreparationMoney model, String isSubmit) {
+	public ResponseModel uploadVoucher(@RequestParam(value = "instanceId",required = false) String instanceId,PreparationMoney model, String isSubmit) {
 
 		preparationMoneyServiceImpl.uploadVoucher(model,instanceId,isSubmit);
 		return CommonResponseNewUtil.failure();

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

@@ -670,6 +670,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 hygfPreparationMoneyAuditingDto.setPreparationMoneyId(model.getSequenceNbr());
                 hygfPreparationMoneyAuditingDto.setPromoter(RequestContext.getExeUserId());
                 hygfPreparationMoneyAuditingService.createWithModel(hygfPreparationMoneyAuditingDto);
+                peasantHouseholdMapper.update(null, up);
 
             }
 
@@ -683,6 +684,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
             List<DocumentStation> listDocumentStation = new ArrayList<>();
             for (DocumentStation documentStation : ids) {
                 documentStation.setPreparationMoneyId(model.getSequenceNbr());
+                documentStation.setSequenceNbr(null);
                 listDocumentStation.add(documentStation);
             }