|
@@ -94,26 +94,27 @@ public class TCtnpriceServiceImpl implements ITCtnpriceService
|
|
|
if (ctnprice.getfDistinationid() == null){
|
|
|
return AjaxResult.error("目的港不能为空");
|
|
|
}
|
|
|
- if (ctnprice.getfPortoftransshipment() == null){
|
|
|
+ /* if (ctnprice.getfPortoftransshipment() == null){
|
|
|
return AjaxResult.error("中转港不能为空");
|
|
|
- }
|
|
|
- if (ctnprice.getfEtd() == null){
|
|
|
+ }*/
|
|
|
+ /*if (ctnprice.getfEtd() == null){
|
|
|
return AjaxResult.error("预计开船日期不能为空");
|
|
|
}
|
|
|
if (ctnprice.getfEta() == null){
|
|
|
return AjaxResult.error("预计到达日期不能为空");
|
|
|
- }
|
|
|
+ }*/
|
|
|
if (ctnprice.getfBegindate() == null){
|
|
|
return AjaxResult.error("有效期止不能为空");
|
|
|
}
|
|
|
+
|
|
|
List<TCtnpriceItems> ctnpriceItems = new ArrayList<>();
|
|
|
if (ctnprice.getfId() == null){
|
|
|
ctnprice.setCreateTime(DateUtils.getNowDate());
|
|
|
ctnprice.setCreateBy(SecurityUtils.getUsername());
|
|
|
- if (ctnprice.getfDays()==null){
|
|
|
+ /*if (ctnprice.getfDays()==null){
|
|
|
long dateDay = DateUtils.getDateDay(ctnprice.getfEta(),ctnprice.getfEtd());
|
|
|
ctnprice.setfDays(dateDay);
|
|
|
- }
|
|
|
+ }*/
|
|
|
int i = tCtnpriceMapper.insertTCtnprice(ctnprice);
|
|
|
JSONArray warehouseJSON = JSONArray.parseArray(tCtnpriceItems);
|
|
|
ctnpriceItems = JSONObject.parseArray(warehouseJSON.toJSONString(), TCtnpriceItems.class);
|
|
@@ -128,10 +129,10 @@ public class TCtnpriceServiceImpl implements ITCtnpriceService
|
|
|
}else {
|
|
|
ctnprice.setUpdateTime(DateUtils.getNowDate());
|
|
|
ctnprice.setUpdateBy(SecurityUtils.getUsername());
|
|
|
- if (ctnprice.getfDays()==null){
|
|
|
+ /*if (ctnprice.getfDays()==null){
|
|
|
long dateDay = DateUtils.getDateDay(ctnprice.getfEta(),ctnprice.getfEtd());
|
|
|
ctnprice.setfDays(dateDay);
|
|
|
- }
|
|
|
+ }*/
|
|
|
if (ctnprice.getfStatus().equals("T") ||ctnprice.getfStatus().equals("正常")){
|
|
|
ctnprice.setfStatus("T");
|
|
|
}else {
|