diff --git a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java index 12c4ddef..f969ea4d 100644 --- a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java +++ b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java @@ -287,8 +287,17 @@ public class WmOmNoticeHController extends BaseController { }else{ request.setAttribute("jianhuoremark", "全部拣货,共"+Double.toString(noticesum)); } - request.setAttribute("tijisum", Double.toString(tijisum)); - request.setAttribute("zhlsum", Double.toString(zhlsum)); + String tijiunit="立方分米"; + String zhongliangunit="公斤"; + try{ + + tijiunit= ResourceUtil.getConfigByName("tijiunit"); + zhongliangunit=ResourceUtil.getConfigByName("zhongliangunit"); + }catch (Exception e){ + + } + request.setAttribute("tijisum", Double.toString(tijisum)+tijiunit); + request.setAttribute("zhlsum", Double.toString(zhlsum)+zhongliangunit); request.setAttribute("wmOmQmIList", wmOmQmIEntityList); }catch (Exception e){ diff --git a/src/main/resources/sysConfig.properties b/src/main/resources/sysConfig.properties index b8233d7c..bd7ef42a 100644 --- a/src/main/resources/sysConfig.properties +++ b/src/main/resources/sysConfig.properties @@ -116,7 +116,7 @@ api_url_result_get = https://api.yonyouup.com/result?requestid={requestid} hiti=off #\u5141\u8BB8\u8D85\u6536 y\u5141\u8BB8 n\u4E0D\u5141\u8BB8 -chaoshou=n +chaoshou=y #\u6253\u5370\u65B9\u5F0F excel page printtype=page @@ -233,12 +233,12 @@ systuopan=yes #\u5BF9\u8D26\u5355\u663E\u793A\u660E\u7EC6 sysdzd=yes #\u4ED3\u5E93\u4FE1\u606F -comname=\u5317\u4EAC\u6B23\u5EB7\u5B81\u5DE5\u8D38\u6709\u9650\u516C\u53F8 -comaddr=\u5317\u4EAC\u5E02\u4E1C\u57CE\u533A\u4E1C\u56DB\u5757\u7389\u5357\u885732\u53F75\u53F7\u697C 503 +comname=\u53A6\u95E8\u5E02\u7075\u9E7F\u8C37\u79D1\u6280\u6709\u9650\u516C\u53F8 +comaddr=\u53A6\u95E8\u5E02\u7075\u9E7F\u8C37\u79D1\u6280\u6709\u9650\u516C\u53F8 comtel= #\u5BF9\u8D26\u4FE1\u606F -comfiname=\u5317\u4EAC\u6B23\u5EB7\u5B81\u5DE5\u8D38\u6709\u9650\u516C\u53F8 -comfiaddr=\u5317\u4EAC\u5E02\u4E1C\u57CE\u533A\u4E1C\u56DB\u5757\u7389\u5357\u885732\u53F75\u53F7\u697C 503 +comfiname=\u53A6\u95E8\u5E02\u7075\u9E7F\u8C37\u79D1\u6280\u6709\u9650\u516C\u53F8 +comfiaddr=\u53A6\u95E8\u5E02\u7075\u9E7F\u8C37\u79D1\u6280\u6709\u9650\u516C\u53F8 comfitel= comfibankid= comfibankname= @@ -272,18 +272,19 @@ scrq=2099-12-31 #\u662F\u5426\u542F\u7528\u5546\u54C1\u6761\u7801 sptmon=yes #beijingend + yydbkey=mssql yy.cuscode=hwm -interfacetype=UAS - - - +interfacetype=U8 #\u96C6\u56E2\u7248\u672C on comgroup=on +#\u62E3\u8D27\u5355\u5355\u4F4D +tijiunit=\u7ACB\u65B9\u5206\u7C73 +zhongliangunit=\u516C\u65A4