|
@@ -81,9 +81,16 @@ public class MeterWorkPreWgttypeController extends BaseRESTfulController {
|
|
|
//@RequiresPermissions("meterworkprewgttype:create")
|
|
//@RequiresPermissions("meterworkprewgttype:create")
|
|
|
@Transactional
|
|
@Transactional
|
|
|
@PostMapping(value = "/")
|
|
@PostMapping(value = "/")
|
|
|
- public RESTfulResult add(@RequestBody MeterWorkPreWgttype model,String preTrackScaleNo){
|
|
|
|
|
|
|
+ public RESTfulResult add(@RequestBody HashMap model){
|
|
|
try {
|
|
try {
|
|
|
- HashMap map = meterWorkPreWgttypeService.addOrAbolish(model);
|
|
|
|
|
|
|
+ MeterWorkPreWgttype meterWorkPreWgttype = new MeterWorkPreWgttype();
|
|
|
|
|
+ meterWorkPreWgttype.setWeightTypeNo(model.get("weightTypeNo") == null?"":model.get("weightTypeNo").toString());
|
|
|
|
|
+ meterWorkPreWgttype.setWeightTypeName(model.get("weightTypeName") == null?"":model.get("weightTypeName").toString());
|
|
|
|
|
+ meterWorkPreWgttype.setCarNo(model.get("carNo") == null?"":model.get("carNo").toString());
|
|
|
|
|
+ meterWorkPreWgttype.setCreateManName(model.get("createManName") == null?"":model.get("createManName").toString());
|
|
|
|
|
+ meterWorkPreWgttype.setCreateManPhone(model.get("createManPhone") == null?"":model.get("createManPhone").toString());
|
|
|
|
|
+ String preTrackScaleNo = model.get("preTrackScaleNo") == null?"":model.get("preTrackScaleNo").toString();
|
|
|
|
|
+ HashMap map = meterWorkPreWgttypeService.addOrAbolish(meterWorkPreWgttype);
|
|
|
if (preTrackScaleNo == "" || preTrackScaleNo.equals("")){
|
|
if (preTrackScaleNo == "" || preTrackScaleNo.equals("")){
|
|
|
if (map.get("code").equals("0")){
|
|
if (map.get("code").equals("0")){
|
|
|
return success();
|
|
return success();
|
|
@@ -94,7 +101,7 @@ public class MeterWorkPreWgttypeController extends BaseRESTfulController {
|
|
|
}else{
|
|
}else{
|
|
|
PreTrackScale preTrackScale = new PreTrackScale();
|
|
PreTrackScale preTrackScale = new PreTrackScale();
|
|
|
preTrackScale.setPredictionNo(preTrackScaleNo);
|
|
preTrackScale.setPredictionNo(preTrackScaleNo);
|
|
|
- preTrackScale.setCarNo(model.getCarNo());
|
|
|
|
|
|
|
+ preTrackScale.setCarNo(meterWorkPreWgttype.getCarNo());
|
|
|
int scale = preTrackScaleService.setPreIndex(preTrackScale);
|
|
int scale = preTrackScaleService.setPreIndex(preTrackScale);
|
|
|
if (map.get("code").equals("0") && scale > 0){
|
|
if (map.get("code").equals("0") && scale > 0){
|
|
|
return success();
|
|
return success();
|