Merge remote-tracking branch 'origin/master'

YYC

2023-06-30 8bba7f03df59c7689dbb64a952a63944a1f43ade

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

@@ -4,13 +4,11 @@
import com.ld.igds.check.dto.CheckItemData;
import com.ld.igds.check.service.CoreCheckStandardService;
import com.ld.igds.common.CoreCommonService;
import com.ld.igds.common.bar.BarCodeUtils;
import com.ld.igds.constant.FoodVariety;
import com.ld.igds.inout.InoutBill;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.inout.dto.InoutRecordItemData;
import com.ld.igds.inout.dto.InoutRecordItemParam;
import com.ld.igds.inout.dto.WeightBill;
import com.ld.igds.inout.dto.*;
import com.ld.igds.inout.service.InoutRecordItemService;
import com.ld.igds.m.dto.NoticeDto;
import com.ld.igds.m.service.HInoutNoticeService;
@@ -116,6 +114,11 @@

        htmlStr = htmlStr.replace("deImpurity", bill.getDeImpurity() + "");
        htmlStr = htmlStr.replace("deWet", bill.getDeWet() + "");

        htmlStr = htmlStr.replace("recordWeight", bill.getRecordWeight() + "");
        htmlStr = htmlStr.replace("deCheck", bill.getDeCheck() + "");
        htmlStr = htmlStr.replace("addCheck", bill.getAddCheck() + "");

        htmlStr = htmlStr.replace("deSum", bill.getDeSum() + "");
        htmlStr = htmlStr.replace("settleWeight",
                new DecimalFormat("0").format(bill.getSettleWeight()));
@@ -127,6 +130,7 @@
        htmlStr = htmlStr.replace("wet", bill.getWet() + "");
        htmlStr = htmlStr.replace("impurity", bill.getImpurity() + "");

        htmlStr = htmlStr.replace("checkStatus", bill.getCheckStatus());
        htmlStr = htmlStr.replace("remark", bill.getRemark());
        htmlStr = htmlStr.replace("moneyName", bill.getMoneyName());

@@ -261,7 +265,6 @@
        bill.setFullTime(DateFormatUtils.format(data.getFullWeightTime(),
                "yyyy-MM-dd HH:mm:ss"));
        bill.setSerId(data.getId());
//        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 +272,6 @@
        }

        //客户信息
        // 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());
@@ -300,20 +302,15 @@
        bill.setFullWeight(data.getFullWeight());
        bill.setEmptyWeight(data.getEmptyWeight());
        bill.setNetWeight(data.getNetWeight());
        bill.setDeCheck(data.getDeCheck());
        bill.setAddCheck(data.getAddCheck());
        bill.setRecordWeight(data.getRecordWeight());
        bill.setCheckStatus(data.getCheckStatus().equals(InoutConstant.STATUS_PASS) ? "合格" : "不合格");

//        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.setDeHandle(data.getDeHandle());
        bill.setDeOther(data.getDeOther());

        bill.setSettleWeight(data.getSettleWeight());
//        if(data.getWet() != null && data.getWet() > 0){
//            bill.setWet(data.getWet() +"");
//        }
//        if(data.getImpurity() != null && data.getImpurity() > 0){
//            bill.setImpurity(data.getImpurity()+"");
//        }

        bill.setPrice(data.getPrice() == null ? "" : data.getPrice() + "");
        if (data.getSettleMoney() <= 0) {
@@ -707,6 +704,26 @@
        return htmlStr;
    }

    /**
     * 打印扦样单，直接返回条形码Base64图片
     *
     * @param data
     * @return
     */
    public String simpleBill(InoutCheckData data) {

        if (null == data.getId()) return null;
        if (null == data.getCheckId()) return null;

        if (null == data.getCheckTime()) {
            data.setCheckTime(new Date());
        }

        String imgBase64 = BarCodeUtils.getBarCodeImageBase64(data.getId(), data.getCheckId(), "粮库扦样单条码", DateFormatUtils.format(data.getCheckTime(), "yyyy-MM-dd HH:mm"));

        return imgBase64;
    }

    public static void main(String[] args) {
        List<String> result = new ArrayList<>();
        result.add("1");
@@ -725,4 +742,6 @@
        List<String> strings3 = result.subList(6, 8);
        System.out.println(strings3);
    }


}