更改进厂为待装

hjg

2024-07-09 30304784e82d4bba24121328da8eb8490aec4f4f

更改进厂为待装

 JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java

@@ -167,6 +167,7 @@
    public List<Map> getHwList(String sdepartNo);

    /** 义瑞、科技LED显示 序号  车号  装车区  状态 **/
    @Deprecated
    @Select({
            "select  bs.numberplates,businessNo,zcWz,firstzxhtime," ,
            "case WHEN EXISTS ( SELECT * FROM bussinessitems WHERE bussinessNo = x.businessNo ) THEN '在装'" ,
@@ -176,5 +177,15 @@
            " where sdepartNo=#{sdepartNo} and firstgbtime is not null and x.lastgbtime is  null order by jctime"
    })
    public List<Map> yRZcList(String sdepartNo);
    // 义瑞、科技LED显示 科技车辆进厂后显示等待，扫码后显示装车，二次过磅后不再显示
    @Select({
            "select bs.numberplates,businessNo,zcWz,firstzxhtime," ,
            "case WHEN EXISTS ( SELECT * FROM bussinessitems WHERE bussinessNo = x.businessNo ) THEN '装车'" ,
            " when x.jctime is not null then '等待' else '' end zcStatus " ,
            " from xs_taskmonitor x" ,
            " join bussinesssheet bs on x.businessNo=bs.bussinessNo and bs.sstatus='在办' " ,
            " where sdepartNo=#{sdepartNo} and jctime is not null and x.lastgbtime is  null order by jctime"
    })
    public List<Map> kjZcList(String sdepartNo);

}

 JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java

@@ -918,7 +918,7 @@
            String strTitle="序号  车号   装车区  状态\r\n";
            String strContent = "";
            String contentFormatStr = "%s   %s  %s   %s\r\n";
            List<Map> list = tdmxper.yRZcList("08");
            List<Map> list = tdmxper.kjZcList("08");
            int index = 1;
            for (Map map : list) {
                String numberplates = (String) map.get("numberplates"); // 车牌号
@@ -944,7 +944,7 @@
        String strTitle="序号  车号   装车区  状态\r\n";
        String strContent = "";
        String contentFormatStr = "%s   %s  %s   %s\r\n";
        List<Map> list = tdmxper.yRZcList("04");
        List<Map> list = tdmxper.kjZcList("04");
        int index = 1;
        for (Map map : list) {
            String numberplates = (String) map.get("numberplates"); // 车牌号

 JavaSource/com/mandi/webservice/service/impl/InvoiceService.java

@@ -374,18 +374,19 @@

    @Override
    public String receiveCurrWeight(HttpServletRequest r, String jsonParam) { // 获取业务单号 一次称重 二次称重
        JsonParser jp=new JsonParser();
        JsonObject jo=jp.parse(jsonParam).getAsJsonObject();
        JsonParser jp = new JsonParser();
        JsonObject jo = jp.parse(jsonParam).getAsJsonObject();
        String businessNo = JSONobj.getstring(jo, "businessNo");
        boolean firstWeighing = JSONobj.getbool(jo, "firstWeighing");
        boolean secondWeighing = JSONobj.getbool(jo, "secondWeighing");
        boolean isJc = JSONobj.getbool(jo, "isJc");
        String sdepartNo = JSONobj.getstring(jo, "sdepartNo");
        if(StringUtils.isBlank(businessNo) || businessNo.indexOf("XS")!=0 || StringUtils.isBlank(sdepartNo)
        if (StringUtils.isBlank(businessNo) || businessNo.indexOf("XS") != 0 || StringUtils.isBlank(sdepartNo)
        ) {
            return null;
        }
        // 刷新
        if(firstWeighing || secondWeighing) { // 称重需要刷新一下
        if (firstWeighing || secondWeighing) { // 称重需要刷新一下
            if ("06".equals(sdepartNo)) { // 明晟
                synchronized (FdXSTDService.refreshMsLedLock) {
                    if (FdXSTDService.refreshMsLedLock) { // 系统繁忙
@@ -402,7 +403,10 @@
                        FdXSTDService.refreshMsLedLock = false;
                    }
                }
            } else if ("08".equals(sdepartNo)) { // 义瑞
            }
        }
        if (firstWeighing || secondWeighing || isJc) { // 称重需要刷新一下
            if ("08".equals(sdepartNo)) { // 义瑞
                synchronized (FdXSTDService.refreshYrLedLock) {
                    if (FdXSTDService.refreshYrLedLock) { // 系统繁忙
                        return null;
@@ -413,26 +417,27 @@
                        FdXSTDService.refreshYrLedLock = true;
                    }
                    fdser.sendToYrLed(null);
                }finally {
                } finally {
                    synchronized (FdXSTDService.refreshYrLedLock) {
                        FdXSTDService.refreshYrLedLock = false;
                    }
                }
            }
        } else if ("04".equals(sdepartNo)) { // 科技
            synchronized (FdXSTDService.refreshYrLedLock) {
                if (FdXSTDService.refreshKjLedLock) { // 系统繁忙
                    return null;
            if ("04".equals(sdepartNo)) { // 科技
                synchronized (FdXSTDService.refreshYrLedLock) {
                    if (FdXSTDService.refreshKjLedLock) { // 系统繁忙
                        return null;
                    }
                }
            }
            try {
                synchronized (FdXSTDService.refreshKjLedLock) {
                    FdXSTDService.refreshKjLedLock = true;
                }
                fdser.sendToKjLed(null);
            } finally {
                synchronized (FdXSTDService.refreshKjLedLock) {
                    FdXSTDService.refreshKjLedLock = false;
                try {
                    synchronized (FdXSTDService.refreshKjLedLock) {
                        FdXSTDService.refreshKjLedLock = true;
                    }
                    fdser.sendToKjLed(null);
                } finally {
                    synchronized (FdXSTDService.refreshKjLedLock) {
                        FdXSTDService.refreshKjLedLock = false;
                    }
                }
            }
        }