调整模块-取消错误代码，添加TODO标记后期处理

jiazx0107@163.com

2023-05-27 ff212e3d6cc57220133aff1d68b6bed02ba8a77b

调整模块-取消错误代码，添加TODO标记后期处理

 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1201.java

@@ -110,9 +110,10 @@
            dto.setShrxm(StringUtils.isEmpty(data.getUser())?"0":data.getUser());
            dto.setQyqy(StringUtils.isEmpty(data.getCheckArea())?"0":data.getCheckArea());
            dto.setQyrxm(StringUtils.isEmpty(data.getCheckUser())?"0":data.getCheckUser());
            dto.setYpsl(data.getCheckNum()==null?"0.0":(data.getCheckNum() + ""));
            dto.setDbsl(StringUtils.isEmpty(data.getCheckRepresent())?"0":data.getCheckRepresent());
            dto.setYpdj(StringUtils.isEmpty(data.getCheckLevel())?"0":data.getCheckLevel());
            // TODO 
//            dto.setYpsl(data.getCheckNum()==null?"0.0":(data.getCheckNum() + ""));
//            dto.setDbsl(StringUtils.isEmpty(data.getCheckRepresent())?"0":data.getCheckRepresent());
//            dto.setYpdj(StringUtils.isEmpty(data.getCheckLevel())?"0":data.getCheckLevel());
            dto.setSfzcccnx(StringUtils.isEmpty(data.getNormalYear())?"0":data.getNormalYear());
            dto.setLsxz(StringUtils.isEmpty(data.getFoodLevel())?"0":data.getFoodLevel());
            dto.setBgbh(data.getId());

 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1202.java

@@ -99,7 +99,7 @@
            dto.setZjbgdnm(data.getCheckId() + data.getCompanyId() + data.getStandardId());
            dto.setZjbgmxnm(data.getCheckId() + data.getCompanyId() + data.getStandardId());
            dto.setJyxmnm(data.getStandardId());
            dto.setJybz(data.getStandardValue());
           // dto.setJybz(data.getStandardValue()); TODO 
            dto.setJyjl(StringUtils.isEmpty(data.getRemarks())?"0":data.getRemarks());
            dto.setBz(StringUtils.isEmpty(data.getRemarks())?"0":data.getRemarks());


 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1301.java

@@ -85,7 +85,7 @@
            dto.setWlnm(StringUtils.isEmpty(noticeOut.getFoodVariety())?"0":noticeOut.getFoodVariety());
            dto.setWlmc(StringUtils.isEmpty(noticeOut.getFoodVariety())?"0":FoodVariety.getMsg(noticeOut.getFoodVariety()));
            dto.setWlbh(StringUtils.isEmpty(noticeOut.getFoodVariety())?"0":noticeOut.getFoodVariety());
            dto.setWldjnm(StringUtils.isEmpty(noticeOut.getFoodLevel())?"0":noticeOut.getFoodLevel());
           // dto.setWldjnm(StringUtils.isEmpty(noticeOut.getFoodLevel())?"0":noticeOut.getFoodLevel()); TODO
            building = hApiShServiceImpl.getBuilding(companyId, noticeOut.getDepotId().substring(0, 25));
            if (null != building) {
                dto.setCfbh(building.getId());

 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java

@@ -98,7 +98,7 @@
            dto.setMzjlsj(DateFormatUtils.format(inoutRecord.getFullWeightTime(),"yyyy-MM-dd HH:mm:ss"));
            dto.setPz(inoutRecord.getEmptyWeight() + "");
            dto.setPzjlsj(DateFormatUtils.format(inoutRecord.getEmptyWeightTime(),"yyyy-MM-dd HH:mm:ss"));
            dto.setZjkl(inoutRecord.getDeSum() + "");
          //  dto.setZjkl(inoutRecord.getDeSum() + ""); TODO 
            dto.setJz(inoutRecord.getSettleWeight() + "");
            dto.setCmsj(DateFormatUtils.format(inoutRecord.getCompleteTime(),"yyyy-MM-dd HH:mm:ss"));
            dto.setCmqrmgryxm(StringUtils.isEmpty(inoutRecord.getCompleteUser())?"0":inoutRecord.getCompleteUser());

 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1304.java

@@ -100,7 +100,7 @@
            dto.setJsje(String.valueOf(settle.getPaySum()));
            dto.setJssj(DateFormatUtils.format(settle.getPayTime()==null?new Date():settle.getPayTime(),"yyyy-MM-dd HH:mm:ss"));
            dto.setJsfs(StringUtils.isEmpty(settle.getPayType())?"0":settle.getPayType());
            dto.setSkr(StringUtils.isEmpty(settle.getCustomerName())?"0":settle.getCustomerName());
           // dto.setSkr(StringUtils.isEmpty(settle.getCustomerName())?"0":settle.getCustomerName()); TODO 
            dto.setYhkh(StringUtils.isEmpty(settle.getBankNum())?"0":settle.getBankNum());

            dto.setSgjsdnm(settle.getId());

 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1308.java

@@ -107,7 +107,7 @@
            dto.setJsyxm(StringUtils.isEmpty(settle.getPayUser())?"0":settle.getPayUser());
            dto.setShrxm(StringUtils.isEmpty(settle.getPayUser())?"0":settle.getPayUser());
            dto.setShsj(DateFormatUtils.format(settle.getPayTime(),"yyyy-MM-dd HH:mm:ss"));
            dto.setKhmc(StringUtils.isEmpty(settle.getCustomerName())?"0":settle.getCustomerName());
          //  dto.setKhmc(StringUtils.isEmpty(settle.getCustomerName())?"0":settle.getCustomerName()); TODO 
            dto.setZdrxm(StringUtils.isEmpty(settle.getPayUser())?"0":settle.getPayUser());
            dto.setZdsj(DateFormatUtils.format(settle.getPayTime(),"yyyy-MM-dd HH:mm:ss"));
            dto.setJsfsmc(StringUtils.isEmpty(settle.getPayType())?"0":settle.getPayType());

 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1311.java

@@ -99,7 +99,7 @@
            dto1311.setNm(data.getDepotId().substring(0, 21));
            dto1311.setZznm(data.getDepotId().substring(0, 21));
            dto1311.setSydjdbh(data.getId());
            dto1311.setWlbh(StringUtils.isEmpty(data.getFoodVariety()) ? "0" : data.getFoodVariety());
           // dto1311.setWlbh(StringUtils.isEmpty(data.getFoodVariety()) ? "0" : data.getFoodVariety()); TODO
            dto1311.setRknx(DateFormatUtils.format((data.getSubmitTime() == null ? new Date() : data.getSubmitTime()), "yyyy"));
            dto1311.setNx(DateFormatUtils.format((data.getSubmitTime() == null ? new Date() : data.getSubmitTime()), "yyyy"));
            dto1311.setLrsj(DateFormatUtils.format((data.getSubmitTime() == null ? new Date() : data.getSubmitTime()), "yyyy-MM-dd HH:mm:ss"));

 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.InoutVarietyChange;
import com.ld.igds.models.InteStatusLog;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1312;
@@ -14,12 +15,15 @@
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.RedisUtil;

import lombok.extern.slf4j.Slf4j;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.*;

/**

 igds-api-inte/src/main/java/com/ld/igds/sh/timer/ShScheduled.java

@@ -69,7 +69,7 @@
        dto.setFcqkLldw(data.getCustomerName());
        dto.setFcqkLssl(data.getSettleWeight());
        dto.setJsqkRksl(data.getSettleWeight());
        dto.setJsqkKszs(data.getDeSum());
        //dto.setJsqkKszs(data.getDeSum()); TODO 

        List<CheckItem> checkItems = hApiShService.listInoutChecks(data.getCompanyId(), data.getCheckId());
        if(null != checkItems && checkItems.size() > 0){
@@ -114,7 +114,7 @@
        dto.setThdw(data.getCustomerName());
        dto.setThc(data.getDepotId());
        dto.setFcsl(data.getSettleWeight());
        dto.setJcs(data.getCurStorage() - data.getSettleWeight());
      //  dto.setJcs(data.getCurStorage() - data.getSettleWeight()); TODO 

        dto.setDataDate(DateFormatUtils.format(data.getCompleteTime(), "yyyy-MM-dd"));
        dto.setUpdateTime(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));

 igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5204.java

@@ -82,7 +82,7 @@
                    dto.setDepotId(inoutData.getDepotId());
                    dto.setDepotName(phoneUtil.getDepotName(authUser.getCompanyId(),
                            inoutData.getDepotId()));
                    dto.setCustomerId(inoutData.getCustomerId());
                  //  dto.setCustomerId(inoutData.getCustomerId()); TODO 
                    dto.setCustomerName(inoutData.getCustomerName());
                    dto.setFoodVariety(inoutData.getFoodVariety());
                    dto.setFoodLevel(inoutData.getFoodLevel());

 igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5206.java

@@ -81,7 +81,7 @@
                    dto.setDepotId(inoutData.getDepotId());
                    dto.setDepotName(phoneUtil.getDepotName(authUser.getCompanyId(),
                            inoutData.getDepotId()));
                    dto.setCustomerId(inoutData.getCustomerId());
                  //  dto.setCustomerId(inoutData.getCustomerId()); TODO
                    dto.setCustomerName(inoutData.getCustomerName());
                    dto.setFoodVariety(inoutData.getFoodVariety());
                    dto.setFoodLevel(inoutData.getFoodLevel());

 igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5208.java

@@ -87,7 +87,7 @@
        inoutHandle.setDepotId(inoutData.getDepotId());
        inoutHandle.setDepotName(phoneUtil.getDepotName(inoutData.getCompanyId(),inoutData.getDepotId()));
        inoutHandle.setDeHandle(inoutData.getDeHandle());
        inoutHandle.setCustomerId(inoutData.getCustomerId());
       // inoutHandle.setCustomerId(inoutData.getCustomerId()); TODO
        inoutHandle.setCustomerName(inoutData.getCustomerName());
        inoutHandle.setFoodVariety(inoutData.getFoodVariety());
        inoutHandle.setSettleWeight(inoutData.getSettleWeight());

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5208.java

@@ -76,8 +76,8 @@
        inoutHandle.setProgressName(phone35Util.getProgressName(phone35AuthUser.getCompanyId(), inoutData.getProgress()));
        inoutHandle.setFoodVarietyName(FoodVariety.getMsg(inoutData.getFoodVariety()));
        inoutHandle.setFoodLevelName(FoodLevel.getMsg(inoutData.getFoodLevel()));
        inoutHandle.setHandleStart(inoutData.getHandleStart());
        inoutHandle.setHandelEnd(inoutData.getHandleEnd());
//        inoutHandle.setHandleStart(inoutData.getHandleStart()); TODO 
//        inoutHandle.setHandelEnd(inoutData.getHandleEnd()); TODO 
        inoutHandle.setProgress(inoutData.getProgress());

        //根据流水id、组织编码查询图片信息

 igds-core/src/main/java/com/ld/igds/check/service/HCheckStandardService.java

@@ -44,9 +44,10 @@
            if(null == data.getId()){
                data.setId(ContextUtil.getTimeId());
            }
            if(null == data.getDeptId()){
                data.setDeptId(ContextUtil.subDeptId(ContextUtil.getLoginUser()));
            }
// TODO
//            if(null == data.getDeptId()){
//                data.setDeptId(ContextUtil.subDeptId(ContextUtil.getLoginUser()));
//            }

            if(null == data.getUpperLimit()) data.setUpperLimit(0.0);


 igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java

@@ -68,13 +68,13 @@
            item.setRuleAddEnd(data.getRuleAddEnd());
            item.setRuleReduce(data.getRuleReduce());
            item.setOperaSymbol(data.getOperaSymbol());

            if (data.getUpperLimit() > 0.0) {
                item.setStandardValue(data.getUpperLimit() + "");
                if(null != data.getOperaSymbol()){
                    item.setStandardValue(data.getOperaSymbol() +" " + data.getUpperLimit());
                }
            }
// TODO 
//            if (data.getUpperLimit() > 0.0) {
//                item.setStandardValue(data.getUpperLimit() + "");
//                if(null != data.getOperaSymbol()){
//                    item.setStandardValue(data.getOperaSymbol() +" " + data.getUpperLimit());
//                }
//            }
            result.add(item);
        }


 igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java

@@ -349,7 +349,6 @@
        } else { //有记录，但是状态与当前作业不一致，也需要初始化
            depotStore.setDepotStatus(depotStatus);
            depotStore.setUpdateDate(new Date());
            depotStore.setCreateDate(new Date());
            depotStore.setUpdateUser(null);
        }

@@ -378,7 +377,6 @@

    @Override
    public void addDepotStore(DepotStore store, boolean updateDepot) {
        if (null == store.getCreateDate()) store.setCreateDate(new Date());
        if (null == store.getUpdateDate()) store.setUpdateDate(new Date());
        if (null == store.getId()) store.setId(ContextUtil.getUUID());


 igds-core/src/main/java/com/ld/igds/models/Depot.java

@@ -93,7 +93,6 @@
    @PropertyDef(label = "粮食年份", description = "与库存表关联，通过库存变更")
    private String foodYear;


    @Column(name = "PER_WET_")
    @PropertyDef(label = "水分", description = "百分比，默认为空，来源质检信息")
    private Double perWet;
@@ -113,6 +112,10 @@
    @Column(name = "STORE_KEEPER_NAME_", length = 50)
    @PropertyDef(label = "保管员", description = "中文名称")
    private String storeKeeperName;
    
    @Column(name = "STORE_DATE_")
    @PropertyDef(label = "入库时间", description = "默认空，通过库存变更")
    private Date storeDate;

    @Column(name = "CHECK_DATE_")
    @PropertyDef(label = "最后质检时间", description = "默认空，来源质检信息")

 igds-core/src/main/java/com/ld/igds/view/DepotPR.java

@@ -164,16 +164,14 @@
            depotService.saveDepot(depot);
        } else {
            depotService.updataDepot(depot);

            if (StringUtils.isNotEmpty(depot.getEditTag())) {
                // è¡¨ç¤ºä¿®æ”¹äº†ä»“库状态
                if (depot.getEditTag().indexOf("depotStatus") >= 0) {
                    this.pullDepotStatus(depot.getCompanyId(), depot.getId(), depot.getDepotStatus());
                }
            }
// TODO
//            if (StringUtils.isNotEmpty(depot.getEditTag())) {
//                // è¡¨ç¤ºä¿®æ”¹äº†ä»“库状态
//                if (depot.getEditTag().indexOf("depotStatus") >= 0) {
//                    this.pullDepotStatus(depot.getCompanyId(), depot.getId(), depot.getDepotStatus());
//                }
//            }
        }
        //恢复标签
        depot.setEditTag(null);

        flushCache();


 igds-core/src/main/java/com/ld/igds/view/service/HDepotStoreService.java

@@ -67,7 +67,6 @@
        try {
            if (StringUtils.isEmpty(data.getId())) {
                data.setId(ContextUtil.getUUID());
                data.setCreateDate(new Date());
                session.save(data);
            } else {
                session.update(data);

 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java

@@ -363,10 +363,10 @@
            }
        }
        progressData.setCheckUser(ContextUtil.getLoginUserCName());
        if (StringUtils.isNotEmpty(data.getCustomerName())) {
            progressData.setCustomerId(data.getCustomerId());
            progressData.setCustomerName(data.getCustomerName());
        }
//        if (StringUtils.isNotEmpty(data.getCustomerName())) {
//            progressData.setCustomerId(data.getCustomerId());
//            progressData.setCustomerName(data.getCustomerName());
//        }
        if (StringUtils.isNotEmpty(data.getDepotId())) {
            progressData.setDepotId(data.getDepotId());
        }
@@ -1012,9 +1012,9 @@
        if (StringUtils.isEmpty(data.getDepotId())) {
            return "请填写仓库信息！";
        }
        if (StringUtils.isEmpty(data.getCustomerId())) {
            return "请填写往来单位信息！";
        }
//        if (StringUtils.isEmpty(data.getCustomerId())) {
//            return "请填写往来单位信息！";
//        }
        if (StringUtils.isEmpty(data.getFoodYear())) {
            return "请填写粮食年份信息！";
        }

 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java

@@ -261,7 +261,7 @@
        bill.setFullTime(DateFormatUtils.format(data.getFullWeightTime(),
                "yyyy-MM-dd HH:mm:ss"));
        bill.setSerId(data.getId());
        bill.setSpecType(StringUtils.isEmpty(data.getSpecType())?"散粮":data.getSpecType());
//        bill.setSpecType(StringUtils.isEmpty(data.getSpecType())?"散粮":data.getSpecType());
        if ("5016".equals(data.getCompanyId())) {
            bill.setCompleteTime(DateFormatUtils.format(data.getCompleteTime(), "yyyy-MM-dd"));
            bill.setSerId(data.getId().substring(2));
@@ -269,7 +269,7 @@
        }

        //客户信息
        bill.setCustomerId(data.getCustomerId() == null ? "" : data.getCustomerId());
       // bill.setCustomerId(data.getCustomerId() == null ? "" : data.getCustomerId());
        bill.setCustomerName(data.getCustomerName() == null ? "" : data.getCustomerName());
        bill.setUserId(data.getUserId() == null ? "" : data.getUserId());
        bill.setUserAddress(data.getUserAddress() == null ? "" : data.getUserAddress());
@@ -301,11 +301,11 @@
        bill.setEmptyWeight(data.getEmptyWeight());
        bill.setNetWeight(data.getNetWeight());

        bill.setDeWet(data.getDeWet());
        bill.setDeImpurity(data.getDeImpurity());
        bill.setDeHandle(data.getDeHandle());
        bill.setDeOther(data.getDeOther());
        bill.setDeSum(data.getDeSum() == null ? 0.0 :data.getDeSum());
//        bill.setDeWet(data.getDeWet());
//        bill.setDeImpurity(data.getDeImpurity());
//        bill.setDeHandle(data.getDeHandle());
//        bill.setDeOther(data.getDeOther());
//        bill.setDeSum(data.getDeSum() == null ? 0.0 :data.getDeSum());

        bill.setSettleWeight(data.getSettleWeight());
//        if(data.getWet() != null && data.getWet() > 0){
@@ -373,7 +373,7 @@
        String key;
        for (CheckItemData item : checkLst) {
            key = item.getStandardId() + "_ST";
            checkBillItems.put(key, item.getStandardValue());
           // checkBillItems.put(key, item.getStandardValue());
            key = item.getStandardId() + "_VAL";
            checkBillItems.put(key, item.getValue());
        }
@@ -449,13 +449,13 @@
    public String inSettleBill(InoutData data, InoutSettle settle) {

        if (null != data) {
            settle.setCompleteTime(data.getCompleteTime());
          //  settle.setCompleteTime(data.getCompleteTime());
            settle.setDepotId(data.getDepotId());
            settle.setDeptId(data.getDeptId());
            settle.setUserName(data.getUserName());
            settle.setPlateNum(data.getPlateNum());
            settle.setFoodLevel(data.getFoodLevel());
            settle.setFoodVariety(data.getFoodVariety());
//            settle.setUserName(data.getUserName());
//            settle.setPlateNum(data.getPlateNum());
//            settle.setFoodLevel(data.getFoodLevel());
//            settle.setFoodVariety(data.getFoodVariety());
        }

        // è°ƒæ•´æ¨¡ç‰ˆæ•°æ®å¹¶è¿”回
@@ -473,26 +473,26 @@
        htmlStr = htmlStr.replace("payTime", time);
        htmlStr = htmlStr.replace("serId", settle.getId());

        htmlStr = htmlStr.replace(
                "customerName",
                settle.getCustomerName() == null ? "" : settle
                        .getCustomerName());
//        htmlStr = htmlStr.replace(
//                "customerName",
//                settle.getCustomerName() == null ? "" : settle
//                        .getCustomerName());
        htmlStr = htmlStr.replace("deptName",
                dept == null ? "" : dept.getName());

        htmlStr = htmlStr.replace("bank", settle.getBank() == null ? ""
                : settle.getBank());
        htmlStr = htmlStr.replace("fullWeight",
                new DecimalFormat("0").format(settle.getFullWeight()));
        htmlStr = htmlStr.replace("emptyWeight",
                new DecimalFormat("0").format(settle.getEmptyWeight()));
//        htmlStr = htmlStr.replace("fullWeight",
//                new DecimalFormat("0").format(settle.getFullWeight()));
//        htmlStr = htmlStr.replace("emptyWeight",
//                new DecimalFormat("0").format(settle.getEmptyWeight()));

        htmlStr = htmlStr.replace("banNum", settle.getBankNum() == null ? ""
                : settle.getBankNum());
        htmlStr = htmlStr.replace("netWeight",
                new DecimalFormat("0").format(settle.getNetWeight()));
        htmlStr = htmlStr.replace("deSum",
                new DecimalFormat("0").format(settle.getDeSum()));
//        htmlStr = htmlStr.replace("netWeight",
//                new DecimalFormat("0").format(settle.getNetWeight()));
//        htmlStr = htmlStr.replace("deSum",
//                new DecimalFormat("0").format(settle.getDeSum()));

        // èŽ·å–仓库信息
        Depot depot = commonService.getCacheDepot(settle.getCompanyId(),
@@ -500,8 +500,8 @@

        htmlStr = htmlStr.replace("depotName",
                depot == null ? "" : depot.getName());
        htmlStr = htmlStr.replace("foodVariety",
                FoodVariety.getMsg(settle.getFoodVariety()));
//        htmlStr = htmlStr.replace("foodVariety",
//                FoodVariety.getMsg(settle.getFoodVariety()));
        htmlStr = htmlStr.replace("payPrice", settle.getPayPrice() + "");
        htmlStr = htmlStr.replace("settleWeight",
                new DecimalFormat("0").format(settle.getSettleWeight()));
@@ -514,8 +514,8 @@
                    depot.getStoreKeeperName() == null ? "" : depot
                            .getStoreKeeperName());
        }
        htmlStr = htmlStr.replace("driverName", settle.getUserName() + "");
        htmlStr = htmlStr.replace("otherSum", settle.getOtherSum() + "");
//        htmlStr = htmlStr.replace("driverName", settle.getUserName() + "");
//        htmlStr = htmlStr.replace("otherSum", settle.getOtherSum() + "");
        htmlStr = htmlStr.replace("paySum", settle.getPaySum() + "");

        htmlStr = htmlStr.replace("remark", settle.getRemarks() == null ? ""

 igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java

@@ -567,14 +567,14 @@
        // èŽ·å–上一车的流水数据
        InoutData inoutData = this.getLastRecord(data.getCompanyId(), data.getDepotId());

        // è®¾ç½®æµæ°´çš„库存
        if (InoutConstant.TYPE_IN.equals(inoutData.getType())) {
            data.setCurStorage(inoutData.getCurStorage()
                    + inoutData.getSettleWeight());
        } else if (InoutConstant.TYPE_OUT.equals(inoutData.getType())) {
            data.setCurStorage(inoutData.getCurStorage()
                    - inoutData.getSettleWeight());
        }
//        // è®¾ç½®æµæ°´çš„库存
//        if (InoutConstant.TYPE_IN.equals(inoutData.getType())) {
//            data.setCurStorage(inoutData.getCurStorage()
//                    + inoutData.getSettleWeight());
//        } else if (InoutConstant.TYPE_OUT.equals(inoutData.getType())) {
//            data.setCurStorage(inoutData.getCurStorage()
//                    - inoutData.getSettleWeight());
//        }

        // æ·»åŠ è¡¥å•æ•°æ®
        this.insertData(data);

 igds-inout/src/main/java/com/ld/igds/inout/view/InoutReportPR.java

@@ -189,11 +189,11 @@
            record.setRemarks(String.valueOf(index));
            emptyWeightSum += record.getEmptyWeight();
            fullWeightSum += record.getFullWeight();
            deWetSum += record.getDeWet();
            deImpuritySum += record.getDeImpurity();
//            deWetSum += record.getDeWet();
//            deImpuritySum += record.getDeImpurity();
            deHandleSum += record.getDeHandle();
            deOtherSum += record.getDeOther();
            deSumSum += record.getDeSum();
        //    deSumSum += record.getDeSum();
            netWeightSum += record.getNetWeight();
            settleWeightSum += record.getSettleWeight();
            index ++;
@@ -202,11 +202,11 @@
        sum.setId("合计");
        sum.setEmptyWeight(emptyWeightSum);
        sum.setFullWeight(fullWeightSum);
        sum.setDeWet(deWetSum);
        sum.setDeImpurity(deImpuritySum);
//        sum.setDeWet(deWetSum);
//        sum.setDeImpurity(deImpuritySum);
        sum.setDeHandle(deHandleSum);
        sum.setDeOther(deOtherSum);
        sum.setDeSum(deSumSum);
    //    sum.setDeSum(deSumSum);
        sum.setNetWeight(netWeightSum);
        sum.setSettleWeight(settleWeightSum);
        result.add(sum);

 igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettlePR.java

@@ -137,22 +137,22 @@
    private InoutSettle getNewSettle(InoutData data) {
        InoutSettle inoutSettle = new InoutSettle();
        inoutSettle.setId(data.getId());
        inoutSettle.setType(data.getType());
        inoutSettle.setCustomerId(data.getCustomerId());
        inoutSettle.setCustomerName(data.getCustomerName());
        inoutSettle.setFullWeight(data.getFullWeight());
        inoutSettle.setEmptyWeight(data.getEmptyWeight());
        inoutSettle.setNetWeight(data.getNetWeight());
    //    inoutSettle.setType(data.getType());
    //    inoutSettle.setCustomerId(data.getCustomerId());
    //    inoutSettle.setCustomerName(data.getCustomerName());
    //    inoutSettle.setFullWeight(data.getFullWeight());
    //    inoutSettle.setEmptyWeight(data.getEmptyWeight());
    //    inoutSettle.setNetWeight(data.getNetWeight());
        inoutSettle.setSettleWeight(data.getSettleWeight());
        inoutSettle.setDeSum(data.getDeSum());
    //    inoutSettle.setDeSum(data.getDeSum());

        inoutSettle.setCompleteTime(data.getCompleteTime());
    //    inoutSettle.setCompleteTime(data.getCompleteTime());
        inoutSettle.setDepotId(data.getDepotId());
        inoutSettle.setDeptId(data.getDeptId());
        inoutSettle.setUserName(data.getUserName());
        inoutSettle.setPlateNum(data.getPlateNum());
        inoutSettle.setFoodLevel(data.getFoodLevel());
        inoutSettle.setFoodVariety(data.getFoodVariety());
    //    inoutSettle.setUserName(data.getUserName());
    //    inoutSettle.setPlateNum(data.getPlateNum());
    //    inoutSettle.setFoodLevel(data.getFoodLevel());
    //    inoutSettle.setFoodVariety(data.getFoodVariety());

        if (data.getPrice() != null) {
            inoutSettle.setPayPrice(data.getPrice());
@@ -167,9 +167,9 @@
    @Expose
    @Transactional
    public String saveData(InoutSettle data) {
        if (null == data.getType()) {
            data.setType(InoutConstant.TYPE_IN);
        }
//        if (null == data.getType()) {
//            data.setType(InoutConstant.TYPE_IN);
//        }

        hSettleService.saveOrUpdateData(data);


 igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java

@@ -129,7 +129,7 @@
        data.setDepotId(lossOver.getDepotId());
        data.setDeptId(lossOver.getDeptId());
        data.setCompanyId(lossOver.getCompanyId());
        data.setFoodVariety(lossOver.getFoodVariety());
        //data.setFoodVariety(lossOver.getFoodVariety());
        data.setCheckStatus(InoutConstant.STATUS_PASS);

        String loginUser = lossOver.getUpdateUser();

 igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java

@@ -143,7 +143,7 @@
                    DepotStatus.STATUS_04.getCode().equals(lastStore.getDepotStatus())) {

                param = new InoutParam();
                param.setStart(lastStore.getCreateDate());
                //param.setStart(lastStore.getCreateDate());
                param.setEnd(new Date());
                param.setDeptId(data.getDeptId());
                param.setDepotId(data.getDepotId());
@@ -158,7 +158,7 @@
                lastStore.setId(ContextUtil.getUUID());
                lastStore.setUpdateUser(null);
                lastStore.setUpdateDate(new Date());
                lastStore.setCreateDate(new Date());
               // lastStore.setCreateDate(new Date());

                if (InoutConstant.TYPE_IN.equals(data.getType())) {
                    lastStore.setStorageReal(lastStore.getStorageReal() + sumRecordWeight);

 igds-manager/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java

ÎļþÒÑɾ³ý

 igds-manager/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml

ÎļþÒÑɾ³ý

 igds-manager/src/main/java/com/ld/igds/m/view/VarietyChangePR.java

ÎļþÒÑɾ³ý

 igds-security/src/main/java/com/ld/igds/sec/service/BlackListWarnService.java

ÎļþÒÑɾ³ý

 igds-security/src/main/java/com/ld/igds/sec/view/BlackListWarn.view.xml

ÎļþÒÑɾ³ý

 igds-security/src/main/java/com/ld/igds/sec/view/BlackListWarnPR.java

ÎļþÒÑɾ³ý

 igds-web/src/main/java/com/ld/igds/TestService.java

ÎļþÒÑɾ³ý