Skip to content

H
hg-smart
Commit 6e804dca by 宋祥
Options

Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev

parents f34356a2 ee17bd40
Showing with 74 additions and 158 deletions
src/main/java/com/baosight/hggp/hg/yx/sql/HGYX001A.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqlMap PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd"> <!-- table information <!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
Generate time : 2024-06-04 9:20:26
Version : 1.0
schema : hggp
tableName : HGYX001A
ID BIGINT NOT NULL primarykey,
ACCOUNT_CODE VARCHAR,
DEP_CODE VARCHAR,
CREATED_BY VARCHAR,
CREATED_NAME VARCHAR,
CREATED_TIME VARCHAR,
UPDATED_BY VARCHAR,
UPDATED_NAME VARCHAR,
UPDATED_TIME VARCHAR,
DELETE_FLAG TINYINT,
INVENT_RECORD_ID BIGINT,
INVENT_TYPE VARCHAR,
INVENT_CODE VARCHAR NOT NULL,
INVENT_NAME VARCHAR NOT NULL,
SPEC VARCHAR,
LENGTH DECIMAL,
WIDTH DECIMAL,
THICK DECIMAL,
QUANTITY DECIMAL,
WEIGHT DECIMAL,
PARENT_ID BIGINT
-->
<sqlMap namespace="HGYX001A"> <sqlMap namespace="HGYX001A">
<typeAlias alias="HGYX001A" type="com.baosight.hggp.hg.yx.domain.HGYX001A"/> <typeAlias alias="HGYX001A" type="com.baosight.hggp.hg.yx.domain.HGYX001A"/>
<sql id="column"> <sql id="column">
ID as "id", <!-- ID --> ID as "id", <!-- ID -->
ACCOUNT_CODE as "accountCode", <!-- 企业编码 --> ACCOUNT_CODE as "accountCode", <!-- 企业编码 -->
DEP_CODE as "depCode", <!-- 部门编码 --> DEP_CODE as "depCode", <!-- 部门编码 -->
CREATED_BY as "createdBy", <!-- 记录创建者 --> CREATED_BY as "createdBy", <!-- 记录创建者 -->
CREATED_NAME as "createdName", <!-- 记录创建名称 --> CREATED_NAME as "createdName", <!-- 记录创建名称 -->
CREATED_TIME as "createdTime", <!-- 记录创建时间 --> CREATED_TIME as "createdTime", <!-- 记录创建时间 -->
UPDATED_BY as "updatedBy", <!-- 记录修改者 --> UPDATED_BY as "updatedBy", <!-- 记录修改者 -->
UPDATED_NAME as "updatedName", <!-- 记录修改名称 --> UPDATED_NAME as "updatedName", <!-- 记录修改名称 -->
UPDATED_TIME as "updatedTime", <!-- 记录修改时间 --> UPDATED_TIME as "updatedTime", <!-- 记录修改时间 -->
DELETE_FLAG as "deleteFlag", <!-- 0-未删除，1-已删除 --> DELETE_FLAG as "deleteFlag", <!-- 0-未删除，1-已删除 -->
INVENT_RECORD_ID as "inventRecordId", <!-- 存货档案id --> INVENT_RECORD_ID as "inventRecordId", <!-- 存货档案id -->
INVENT_TYPE as "inventType", <!-- 存货类型 --> INVENT_TYPE as "inventType", <!-- 存货类型 -->
INVENT_CODE as "inventCode", <!-- 存货编码 --> INVENT_CODE as "inventCode", <!-- 存货编码 -->
INVENT_NAME as "inventName", <!-- 存货名称 --> INVENT_NAME as "inventName", <!-- 存货名称 -->
SPEC as "spec", <!-- 规格 --> SPEC_ID as "specId", <!-- 规格ID -->
LENGTH as "length", <!-- 长 --> SPEC as "spec", <!-- 规格 -->
WIDTH as "width", <!-- 宽 --> LENGTH as "length", <!-- 长 -->
THICK as "thick", <!-- 厚 --> WIDTH as "width", <!-- 宽 -->
QUANTITY as "quantity", <!-- 发货数量 --> THICK as "thick", <!-- 厚 -->
UNIT_WEIGHT as "unitWeight", <!-- 发货单重 --> QUANTITY as "quantity", <!-- 发货数量 -->
WEIGHT as "weight", <!-- 发货重量 --> UNIT_WEIGHT as "unitWeight", <!-- 发货单重 -->
PARENT_ID as "parentId", <!-- 销售发货ID --> WEIGHT as "weight", <!-- 发货重量 -->
INVENT_TYPE_DETAIL as "inventTypeDetail" PARENT_ID as "parentId", <!-- 销售发货ID -->
INVENT_TYPE_DETAIL as "inventTypeDetail"
</sql> </sql>
<sql id="condition"> <sql id="condition">
<include refid="HGXSDataAuth.authCondition"/> <include refid="HGXSDataAuth.authCondition"/>
<isNotEmpty prepend=" AND " property="id"> <isNotEmpty prepend=" AND " property="id">
...@@ -148,98 +124,36 @@ ...@@ -148,98 +124,36 @@
<include refid="condition" /> <include refid="condition" />
</select> </select>
<!--
<isNotEmpty prepend=" AND " property="id">
ID = #id#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="accountCode">
ACCOUNT_CODE = #accountCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="depCode">
DEP_CODE = #depCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdBy">
CREATED_BY = #createdBy#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdName">
CREATED_NAME = #createdName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdTime">
CREATED_TIME = #createdTime#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="updatedBy">
UPDATED_BY = #updatedBy#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="updatedName">
UPDATED_NAME = #updatedName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="updatedTime">
UPDATED_TIME = #updatedTime#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="deleteFlag">
DELETE_FLAG = #deleteFlag#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="inventRecordId">
INVENT_RECORD_ID = #inventRecordId#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="inventType">
INVENT_TYPE = #inventType#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="inventCode">
INVENT_CODE = #inventCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="inventName">
INVENT_NAME = #inventName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="spec">
SPEC = #spec#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="length">
LENGTH = #length#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="width">
WIDTH = #width#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="thick">
THICK = #thick#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="quantity">
QUANTITY = #quantity#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="weight">
WEIGHT = #weight#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="parentId">
PARENT_ID = #parentId#
</isNotEmpty>
-->
<insert id="insert"> <insert id="insert">
INSERT INTO ${hggpSchema}.HGYX001A (ID, <!-- ID --> INSERT INTO ${hggpSchema}.HGYX001A (ID, <!-- ID -->
ACCOUNT_CODE, <!-- 企业编码 --> ACCOUNT_CODE, <!-- 企业编码 -->
DEP_CODE, <!-- 部门编码 --> DEP_CODE, <!-- 部门编码 -->
CREATED_BY, <!-- 记录创建者 --> CREATED_BY, <!-- 记录创建者 -->
CREATED_NAME, <!-- 记录创建名称 --> CREATED_NAME, <!-- 记录创建名称 -->
CREATED_TIME, <!-- 记录创建时间 --> CREATED_TIME, <!-- 记录创建时间 -->
UPDATED_BY, <!-- 记录修改者 --> UPDATED_BY, <!-- 记录修改者 -->
UPDATED_NAME, <!-- 记录修改名称 --> UPDATED_NAME, <!-- 记录修改名称 -->
UPDATED_TIME, <!-- 记录修改时间 --> UPDATED_TIME, <!-- 记录修改时间 -->
DELETE_FLAG, <!-- 0-未删除，1-已删除 --> DELETE_FLAG, <!-- 0-未删除，1-已删除 -->
INVENT_RECORD_ID, <!-- 存货档案id --> INVENT_RECORD_ID, <!-- 存货档案id -->
INVENT_TYPE, <!-- 存货类型 --> INVENT_TYPE, <!-- 存货类型 -->
INVENT_CODE, <!-- 存货编码 --> INVENT_CODE, <!-- 存货编码 -->
INVENT_NAME, <!-- 存货名称 --> INVENT_NAME, <!-- 存货名称 -->
SPEC, <!-- 规格 --> SPEC_ID, <!-- 规格ID -->
LENGTH, <!-- 长 --> SPEC, <!-- 规格 -->
WIDTH, <!-- 宽 --> LENGTH, <!-- 长 -->
THICK, <!-- 厚 --> WIDTH, <!-- 宽 -->
QUANTITY, <!-- 发货数量 --> THICK, <!-- 厚 -->
UNIT_WEIGHT, <!-- 发货单重 --> QUANTITY, <!-- 发货数量 -->
WEIGHT, <!-- 发货重量 --> UNIT_WEIGHT, <!-- 发货单重 -->
PARENT_ID, <!-- 销售发货ID --> WEIGHT, <!-- 发货重量 -->
INVENT_TYPE_DETAIL PARENT_ID, <!-- 销售发货ID -->
) INVENT_TYPE_DETAIL
VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #inventRecordId#, #inventType#, #inventCode#, #inventName#, #spec#, #length#, #width#, #thick#, #quantity#, #unitWeight#, #weight#, #parentId#,#inventTypeDetail#) )
VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#,
#updatedName#, #updatedTime#, #deleteFlag#, #inventRecordId#, #inventType#, #inventCode#,
#inventName#, #specId#, #spec#, #length#, #width#, #thick#, #quantity#, #unitWeight#,
#weight#, #parentId#,#inventTypeDetail#)
</insert> </insert>
<delete id="delete"> <delete id="delete">
......
src/main/webapp/HG/YX/HGYX001A.js
...@@ -23,7 +23,7 @@ $(function() { ...@@ -23,7 +23,7 @@ $(function() {
columns: [{ columns: [{
field: "inventType", field: "inventType",
filter: function (options) { filter: function (options) {
return _.filter(inventTypeBox, function (item) { return _.filter(INVENT_TYPE_BOX, function (item) {
return item["param1Field"]=="true"; return item["param1Field"]=="true";
}) })
}, },
...@@ -36,18 +36,18 @@ $(function() { ...@@ -36,18 +36,18 @@ $(function() {
filter: function (options) { filter: function (options) {
let inventType = options.model["inventType"]; let inventType = options.model["inventType"];
if (inventType){ if (inventType){
return _.filter(inventCodedBox, function (item) { return _.filter(INVENT_CODE_BOX, function (item) {
return item["param1Field"] === inventType; return item["param1Field"] === inventType;
}) })
} }
return options.values; return options.values;
}, },
template: function (dataItem) { template: function (dataItem) {
for (let i = 0; i < inventCodedBox.length; i++) { for (let i = 0; i < INVENT_CODE_BOX.length; i++) {
if (inventCodedBox[i]['valueField'] === dataItem['inventCode']){ if (INVENT_CODE_BOX[i]['valueField'] === dataItem['inventCode']){
dataItem['inventName'] = inventCodedBox[i]['textField'] dataItem['inventName'] = INVENT_CODE_BOX[i]['textField']
dataItem['inventRecordId'] = inventCodedBox[i]['param2Field']; dataItem['inventRecordId'] = INVENT_CODE_BOX[i]['param2Field'];
return inventCodedBox[i]['textField']; return INVENT_CODE_BOX[i]['textField'];
} }
} }
return dataItem["inventCode"]; return dataItem["inventCode"];
...@@ -57,7 +57,7 @@ $(function() { ...@@ -57,7 +57,7 @@ $(function() {
filter: function (options) { filter: function (options) {
let specId = options.model["inventRecordId"]; let specId = options.model["inventRecordId"];
if (specId){ if (specId){
return _.filter(specIdBox, function (item) { return _.filter(SPEC_BOX, function (item) {
return item["param7Field"] === specId; return item["param7Field"] === specId;
}) })
} }
...@@ -409,8 +409,9 @@ function detailCallback(result) { ...@@ -409,8 +409,9 @@ function detailCallback(result) {
let rows = resultGrid.getDataItems(); let rows = resultGrid.getDataItems();
if (result.length> 0) { if (result.length> 0) {
for (let i = 0; i < result.length; i++) { for (let i = 0; i < result.length; i++) {
let specId = rows.filter(row => row.inventRecordId == result[i].specId) let filters = rows.filter(row => row.inventCode == result[i].inventCode
if (specId.length > 0){ && row.spec == result[i].spec);
if (filters.length > 0){
message("无法重复添加!"); message("无法重复添加!");
return false; return false;
} }
......
src/main/webapp/HG/YX/HGYX001A.jsp
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false" columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
filter="contains"> filter="contains">
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="inventRecordId" cname="规格ID" width="120" enable="true" readonly="true" align="center" hidden="true" maxLength="50"/> <EF:EFColumn ename="specId" cname="规格ID" width="120" enable="true" readonly="true" align="center" hidden="true" maxLength="50"/>
<EF:EFColumn ename="length" cname="长度(MM)" enable="false" readonly="false" width="100" align="right" format="{0:N3}" maxLength="10"/> <EF:EFColumn ename="length" cname="长度(MM)" enable="false" readonly="false" width="100" align="right" format="{0:N3}" maxLength="10"/>
<EF:EFColumn ename="width" cname="宽度(MM)" enable="false" readonly="false" width="100" align="right" format="{0:N3}" maxLength="10"/> <EF:EFColumn ename="width" cname="宽度(MM)" enable="false" readonly="false" width="100" align="right" format="{0:N3}" maxLength="10"/>
<EF:EFColumn ename="thick" cname="厚度(MM)" enable="false" readonly="false" width="100" align="right" format="{0:N3}" maxLength="10"/> <EF:EFColumn ename="thick" cname="厚度(MM)" enable="false" readonly="false" width="100" align="right" format="{0:N3}" maxLength="10"/>
......
src/main/webapp/HG/YX/HGYX001C.jsp
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true" columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true"
filter="contains"> filter="contains">
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="inventRecordId" cname="规格ID" width="120" enable="true" readonly="true" align="center" hidden="true" maxLength="50"/> <EF:EFColumn ename="specId" cname="规格ID" width="120" enable="true" readonly="true" align="center" hidden="true" maxLength="50"/>
<EF:EFColumn ename="length" cname="长度(MM)" enable="true" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/> <EF:EFColumn ename="length" cname="长度(MM)" enable="true" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/>
<EF:EFColumn ename="width" cname="宽度(MM)" enable="true" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/> <EF:EFColumn ename="width" cname="宽度(MM)" enable="true" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/>
<EF:EFColumn ename="thick" cname="厚度(MM)" enable="true" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/> <EF:EFColumn ename="thick" cname="厚度(MM)" enable="true" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/>
......
src/main/webapp/HG/YX/HGYX002A.js
...@@ -433,8 +433,9 @@ function detailCallback(result) { ...@@ -433,8 +433,9 @@ function detailCallback(result) {
let rows = resultGrid.getDataItems(); let rows = resultGrid.getDataItems();
if (result.length> 0) { if (result.length> 0) {
for (let i = 0; i < result.length; i++) { for (let i = 0; i < result.length; i++) {
let specId = rows.filter(row => row.inventRecordId == result[i].inventRecordId) let filters = rows.filter(row => row.inventCode == result[i].inventCode
if (specId.length > 0){ && row.spec == result[i].spec);
if (filters.length > 0){
message("无法重复添加!"); message("无法重复添加!");
return false; return false;
} }
......
src/main/webapp/HG/YX/HGYX002A.jsp
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false" columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="false"
filter="contains"> filter="contains">
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="inventRecordId" cname="规格ID" width="120" enable="true" readonly="true" align="center" hidden="true" maxLength="50"/> <EF:EFColumn ename="specId" cname="规格ID" width="120" enable="true" readonly="true" align="center" hidden="true" maxLength="50"/>
<EF:EFColumn ename="length" cname="长度(MM)" enable="false" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/> <EF:EFColumn ename="length" cname="长度(MM)" enable="false" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/>
<EF:EFColumn ename="width" cname="宽度(MM)" enable="false" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/> <EF:EFColumn ename="width" cname="宽度(MM)" enable="false" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/>
<EF:EFColumn ename="thick" cname="厚度(MM)" enable="false" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/> <EF:EFColumn ename="thick" cname="厚度(MM)" enable="false" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/>
......
src/main/webapp/HG/YX/HGYX002C.jsp
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
columnTemplate="#=textField#" itemTemplate="#=textField#" columnTemplate="#=textField#" itemTemplate="#=textField#"
filter="contains"> filter="contains">
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="inventRecordId" cname="规格ID" width="120" enable="true" readonly="true" align="center" hidden="true" maxLength="50"/> <EF:EFColumn ename="specId" cname="规格ID" width="120" enable="true" readonly="true" align="center" hidden="true" maxLength="50"/>
<EF:EFColumn ename="length" cname="长度(MM)" enable="true" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/> <EF:EFColumn ename="length" cname="长度(MM)" enable="true" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/>
<EF:EFColumn ename="width" cname="宽度(MM)" enable="true" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/> <EF:EFColumn ename="width" cname="宽度(MM)" enable="true" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/>
<EF:EFColumn ename="thick" cname="厚度(MM)" enable="true" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/> <EF:EFColumn ename="thick" cname="厚度(MM)" enable="true" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment