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

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

@@ -305,6 +305,17 @@ public class PreparationMoneyController extends BaseController {
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/submitOrder")
+	@ApiOperation(httpMethod = "POST",value = "补货审核",  notes = "补货审核")
+	@GlobalTransactional
+	public ResponseModel  submitOrder(@RequestParam(value = "instanceId") String instanceId,
+									  @RequestParam(value = "isSubmit") String isSubmit,
+									  @RequestBody PreparationMoney model) {
+		preparationMoneyServiceImpl.submitOrder( model,  instanceId,  isSubmit);
+		return CommonResponseNewUtil.failure();
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/preparationStation")
 	@ApiOperation(httpMethod = "GET",value = "发货电站",  notes = "发货电站")
 	@GlobalTransactional

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

@@ -73,8 +73,6 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
     private PreparationMoneyLogServiceImpl preparationMoneyLogService;
 
     @Autowired
-    private HygfReplenishmentMapper hygfReplenishmentMapper;
-    @Autowired
     RegionalCompaniesMapper regionalCompaniesMapper;
     @Autowired
     DocumentStationMapper documentStationMapper;