客户需求优化调整4

czt

2026-02-07 2ebf9333d0a53949ff647444064a4c2b73c52fd3

客户需求优化调整4

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java

@@ -360,6 +360,9 @@
            }
        }

        if(null != resultData.getFullWeight() && null != resultData.getEmptyWeight()){
            resultData.setNetWeight(resultData.getFullWeight() - resultData.getEmptyWeight());
        }
        return resultData;
    }


 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java

@@ -66,6 +66,9 @@
        param.setCompanyId(ContextUtil.getCompanyId());

        queryWrapper.eq("company_id", param.getCompanyId());
        if (StringUtils.isNotBlank(param.getDeptId())) {
            queryWrapper.eq("dept_id", param.getDeptId());
        }
        if (StringUtils.isNotBlank(param.getCustomerName())) {
            queryWrapper.like("customer_name", param.getCustomerName());
        }
@@ -261,6 +264,9 @@
        param.setCompanyId(ContextUtil.getCompanyId());

        queryWrapper.eq("company_id", param.getCompanyId());
        if (StringUtils.isNotBlank(param.getDeptId())) {
            queryWrapper.eq("dept_id", param.getDeptId());
        }
        if (StringUtils.isNotBlank(param.getCustomerName())) {
            queryWrapper.like("customer_name", param.getCustomerName());
        }

 fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml

@@ -272,7 +272,7 @@
        <Button>
          <ClientEvent name="onClick">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
                        if(data){&#xD;
                        view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,data.toJSON()).flushAsync();&#xD;
                        view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,data).flushAsync();&#xD;
                        }else{&#xD;
                        view.get(&quot;#dsMain&quot;).flushAsync();&#xD;
                        }</ClientEvent>

 fzzy-igdss-web/src/main/resources/static/group/index.js

@@ -365,21 +365,24 @@
                num7 = '近七天数量'+ item.warnNum7 + '个';
            }
            html += '<div class="panel-content-body-tr">';
            if (item.warnNum7 > 10) {
            if (item.dailyTotal > 0) {
                flag = true;
                html += '<span class="body-item sp" style="color: #bc2032;flex: 1.5;">' + item.deptName + '</span>';
                html += '<span class="body-item sp" style="color: #bc2032;">' + num1 + '</span>';
                html += '<span class="body-item sp" style="color: #bc2032;">' + num7 + '</span>';
            } else if (item.warnNum7 > 1 && item.warnNum7 < 10) {
                flag = true;
                html += '<span class="body-item sp" style="color: #f37b3d;flex: 1.5;">' + item.deptName + '</span>';
                html += '<span class="body-item sp" style="color: #f37b3d;">' + num1+ '</span>';
                html += '<span class="body-item sp" style="color: #f37b3d;">' + num7 + '</span>';
            }else {
            }
            // if (item.warnNum7 > 10) {
            //     flag = true;
            //     html += '<span class="body-item sp" style="color: #bc2032;flex: 1.5;">' + item.deptName + '</span>';
            //     html += '<span class="body-item sp" style="color: #bc2032;">' + num1 + '</span>';
            //     html += '<span class="body-item sp" style="color: #bc2032;">' + num7 + '</span>';
            // } else if (item.warnNum7 > 1 && item.warnNum7 < 10) {
            //     flag = true;
            //     html += '<span class="body-item sp" style="color: #f37b3d;flex: 1.5;">' + item.deptName + '</span>';
            //     html += '<span class="body-item sp" style="color: #f37b3d;">' + num1+ '</span>';
            //     html += '<span class="body-item sp" style="color: #f37b3d;">' + num7 + '</span>';
            // }else {
                html += '<span class="body-item sp" style="flex: 1.5;">' + item.deptName + '</span>';
                html += '<span class="body-item sp">' + num1 + '</span>';
                html += '<span class="body-item sp">' + num7 + '</span>';
            }
            // }
            html += '</div>';
        })
    }