fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutRecord.java
@@ -231,7 +231,7 @@ @TableField("complete_user") private String completeUser; @Column(name = "remarks", columnDefinition = "varchar(100) COMMENT '备注说明'") @Column(name = "remarks", columnDefinition = "varchar(500) COMMENT '备注说明'") @TableField("remarks") private String remarks;
@@ -360,6 +360,9 @@ } } if(null != resultData.getFullWeight() && null != resultData.getEmptyWeight()){ resultData.setNetWeight(resultData.getFullWeight() - resultData.getEmptyWeight()); } return resultData; }
@@ -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()); } @@ -262,6 +265,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-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
@@ -347,7 +347,7 @@ */ public String checkRemarks(InoutRecord updateData, InoutRecord record) { String remarks = "[" + ContextUtil.getLoginUserName() + "]修改数据："; String remarks = "【" + ContextUtil.getLoginUserName() + "】于["+DateFormatUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"]修改数据："; boolean updateTag = false; //校验仓库信息 fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
@@ -366,11 +366,6 @@ view.get("#btnDel").set("visible",false);
 }
 
 if("OUT" == TYPE){
 view.get("#recordWeight").set("caption","出库重量");
 }else{
 view.get("#recordWeight").set("caption","入库重量");
 }
 
 //默认查询查询提条件
 view.get("#dsQuery").insert({
 @@ -701,15 +696,6 @@ <Property name="align">center</Property> <Property name="width">100</Property> </DataColumn> <DataColumn id="recordWeight"> <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
 arg.processDefault = true;</ClientEvent> <Property name="property">recordWeight</Property> <Property name="align">center</Property> <Property name="width">100</Property> <Property name="visible">true</Property> <Property name="name">recordWeight</Property> </DataColumn> <DataColumn name="progress"> <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
 arg.processDefault = true;</ClientEvent> @@ -930,12 +916,6 @@ <AutoFormElement> <Property name="name">settleWeight</Property> <Property name="property">settleWeight</Property> <Property name="readOnly">true</Property> <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">recordWeight</Property> <Property name="property">recordWeight</Property> <Property name="readOnly">true</Property> <Editor/> </AutoFormElement> fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
@@ -697,13 +697,6 @@ <Property name="width">100</Property> </DataColumn> <DataColumn> <Property name="property">recordWeight</Property> <Property name="align">center</Property> <Property name="name">recordWeight</Property> <Property name="caption">入库重量</Property> <Property name="width">100</Property> </DataColumn> <DataColumn> <Property name="property">completeTime</Property> <Property name="align">center</Property> <Property name="name">completeTime</Property> @@ -769,13 +762,6 @@ <Property name="property">settleWeight</Property> <Property name="caption">结算重量</Property> <Property name="align">center</Property> <Property name="width">100</Property> </DataColumn> <DataColumn> <Property name="property">recordWeight</Property> <Property name="align">center</Property> <Property name="name">recordWeight</Property> <Property name="caption">入库重量</Property> <Property name="width">100</Property> </DataColumn> <DataColumn> fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java
@@ -77,6 +77,7 @@ result.put("createUser", ContextUtil.getLoginUserName()); result.put("createTime", new Date()); result.put("title", title); result.put("type", type); return result; fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
@@ -689,13 +689,6 @@ <Property name="width">100</Property> </DataColumn> <DataColumn> <Property name="property">recordWeight</Property> <Property name="align">center</Property> <Property name="name">recordWeight</Property> <Property name="caption">出库重量</Property> <Property name="width">100</Property> </DataColumn> <DataColumn> <Property name="property">completeTime</Property> <Property name="align">center</Property> <Property name="name">completeTime</Property> @@ -761,13 +754,6 @@ <Property name="property">settleWeight</Property> <Property name="caption">结算重量</Property> <Property name="align">center</Property> <Property name="width">100</Property> </DataColumn> <DataColumn> <Property name="property">recordWeight</Property> <Property name="align">center</Property> <Property name="name">recordWeight</Property> <Property name="caption">出库重量</Property> <Property name="width">100</Property> </DataColumn> <DataColumn> 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("#dsQuery.data");
 if(data){
 view.get("#dsMain").set("parameter",data.toJSON()).flushAsync();
 view.get("#dsMain").set("parameter",data).flushAsync();
 }else{
 view.get("#dsMain").flushAsync();
 }</ClientEvent> fzzy-igdss-web/src/main/resources/application-pro.yml
@@ -144,7 +144,7 @@ cipherKey: session: # Session超时时间，-1代表永不过期（默认30分钟） expireTime: -1 expireTime: 43200 # 同步session到数据库的周期（默认1分钟） dbSyncPeriod: 1 # 相隔多久检查一次session的有效性，默认就是10分钟 fzzy-igdss-web/src/main/resources/application-pro5372.yml
@@ -144,7 +144,7 @@ cipherKey: session: # Session超时时间，-1代表永不过期（默认30分钟） expireTime: -1 expireTime: 43200 # 同步session到数据库的周期（默认1分钟） dbSyncPeriod: 1 # 相隔多久检查一次session的有效性，默认就是10分钟 fzzy-igdss-web/src/main/resources/application.yml
@@ -156,7 +156,7 @@ cipherKey: session: # Session超时时间，-1代表永不过期（默认30分钟） expireTime: -1 expireTime: 43200 # 同步session到数据库的周期（默认1分钟） dbSyncPeriod: 1 # 相隔多久检查一次session的有效性，默认就是10分钟 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>'; }) }
