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

whycq

2022-03-30 0aa1c9d1a42e2ac5639228d23dfedbc03ded6fb5

 src/main/java/zy/cloud/wms/manager/controller/ItemController.java

@@ -24,6 +24,7 @@
import zy.cloud.wms.manager.service.ProjectPlanService;
import zy.cloud.wms.manager.service.ProjectTypeService;

import java.text.SimpleDateFormat;
import java.util.*;

@RestController
@@ -158,6 +159,16 @@
            item.setRealEndTime(newitem.getRealEndTime());
            item.setRealStartTime(newitem.getRealStartTime());
        }
        //超出运费
        if(item.getPlandeAmt()!=null && item.getRealdeAmt()!=null){
            item.setExcessAmount(item.getRealdeAmt()-item.getPlandeAmt());
        }
        //超出天数
        if(item.getRealinDate()!=null && item.getPlaninDate()!=null){
            Double days = (double) ((item.getRealinDate().getTime() - item.getPlaninDate().getTime()) / (1000*3600*24));      
            Integer day= (int) Math.ceil(days);
            item.setExcessTime(day);
        }
        item.setUpdateBy(getUserId());
        item.setUpdateTime(new Date());
        itemService.update(item,new EntityWrapper<Item>()