Commit e8df593e authored by hezhuozhi's avatar hezhuozhi

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

parents 817bb91e b7d6229d
......@@ -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
......
......@@ -73,8 +73,6 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
private PreparationMoneyLogServiceImpl preparationMoneyLogService;
@Autowired
private HygfReplenishmentMapper hygfReplenishmentMapper;
@Autowired
RegionalCompaniesMapper regionalCompaniesMapper;
@Autowired
DocumentStationMapper documentStationMapper;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment