huojin
/
nzwms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2024-10-17 11:06:42 +08:00
parent 580a8c86b9
commit 8150e2e6f0
5 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/webapp/WEB-INF/classes/config/origen/enumerate_zh.properties
View File

@ -142,6 +142,9 @@ InventoryLogType.COMPANY_TRANS_OUT=\u8d27\u6743\u8f6c\u51fa
InventoryLogType.COMPANY_TRANS_IN=\u8d27\u6743\u8f6c\u5165 InventoryLogType.COMPANY_TRANS_IN=\u8d27\u6743\u8f6c\u5165
InventoryLogType.-=- InventoryLogType.-=-
IncDec.1=\u589E\u52A0
IncDec.-1=\u51CF\u5C11
#countStatus #countStatus
CountStatus.OPEN=\u6253\u5f00 CountStatus.OPEN=\u6253\u5f00
CountStatus.ACTIVE=\u751f\u6548 CountStatus.ACTIVE=\u751f\u6548

21
src/webapp/WEB-INF/classes/config/origen/inventory/maintainInventoryLogPage.xml
View File

@ -24,8 +24,21 @@
<text id="item.code" title="item.code" row="3" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/> <text id="item.code" title="item.code" row="3" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/>
<text id="item.name" title="item.name" row="3" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/> <text id="item.name" title="item.name" row="3" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/>
<text id="inventoryLog.operator" title="inventoryLog.operator" row="4" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/> <text id="inventoryLog.operator" title="inventoryLog.operator" row="4" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/>
<list id="propC3" title="子库" row="4" col="2" width="120px" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="Sublibrary">
<hql><![CDATA[ SELECT
enumerate.enumValue, enumerate.enumValue
FROM Enumerate enumerate
WHERE enumerate.enumType = 'Sublibrary']]></hql>
</list>
<dateRanger id="occurTime" title="inventoryLog.occurTime" row="5" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="occurTime.beginDate" toDate="occurTime.endDate"/> <list id="incOrDec" title="增减类型" row="5" col="1" width="120px" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="IncDec">
<hql><![CDATA[ SELECT
enumerate.enumValue, enumerate.enumValue
FROM Enumerate enumerate
WHERE enumerate.enumType = 'INCDEC']]></hql>
</list>
<dateRanger id="occurTime" title="inventoryLog.occurTime" row="6" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="occurTime.beginDate" toDate="occurTime.endDate"/>
</inputUIs> </inputUIs>
</search> </search>
<datasource type="hql"><![CDATA[SELECT <datasource type="hql"><![CDATA[SELECT
@ -56,7 +69,9 @@
/~relatedBill: AND inventoryLog.relatedBill LIKE upper({relatedBill})~/ /~relatedBill: AND inventoryLog.relatedBill LIKE upper({relatedBill})~/
/~occurTime.beginDate: AND trunc(inventoryLog.occurTime) >= {occurTime.beginDate}~/ /~occurTime.beginDate: AND trunc(inventoryLog.occurTime) >= {occurTime.beginDate}~/
/~occurTime.endDate: AND trunc(inventoryLog.occurTime) <= {occurTime.endDate}~/ /~occurTime.endDate: AND trunc(inventoryLog.occurTime) <= {occurTime.endDate}~/
/~inventoryLog.operator: AND inventoryLog.operator LIKE upper({inventoryLog.operator})~/ /~inventoryLog.operator: AND inventoryLog.operator LIKE upper({inventoryLog.operator})~/
/~propC3: AND inventoryLog.itemKey.lotInfo.propC3 LIKE {propC3}~/
/~incOrDec: AND inventoryLog.incOrDec = cast({incOrDec} as int)~/
ORDER BY inventoryLog.occurTime DESC]]></datasource> ORDER BY inventoryLog.occurTime DESC]]></datasource>
<columns> <columns>
<column id="inventoryLog.id" width="60" title="inventoryLog.id" visible="true" sortIndex="1" sortType="DESC"/> <column id="inventoryLog.id" width="60" title="inventoryLog.id" visible="true" sortIndex="1" sortType="DESC"/>
@ -69,7 +84,7 @@
<column id="inventoryLog.itemKey.lotInfo.propC9" width="120" title="inventory.barCode" visible="true" horizonAlign="center"/> <column id="inventoryLog.itemKey.lotInfo.propC9" width="120" title="inventory.barCode" visible="true" horizonAlign="center"/>
<column id="inventoryLog.itemKey.lotInfo.propC8" width="120" title="颜色" visible="true" horizonAlign="center"/> <column id="inventoryLog.itemKey.lotInfo.propC8" width="120" title="颜色" visible="true" horizonAlign="center"/>
<column id="inventoryLog.itemKey.lotInfo.propC3" width="50" title="lotInfo.propC3" visible="true" horizonAlign="center"/> <column id="inventoryLog.itemKey.lotInfo.propC3" width="50" title="lotInfo.propC3" visible="true" horizonAlign="center"/>
<column id="inventoryLog.incOrDec" title="inventoryLog.incOrDec" width="80" visible="true" horizonAlign="center" format="incDecFormat"/> <column id="inventoryLog.incOrDec" title="inventoryLog.incOrDec" width="80" visible="true" horizonAlign="center" format="incDecFormat" />
<column id="inventoryLog.occurQuantity" title="inventoryLog.occurQuantity" visible="true" horizonAlign="center"/> <column id="inventoryLog.occurQuantity" title="inventoryLog.occurQuantity" visible="true" horizonAlign="center"/>
<column id="inventoryLog.description" title="备注" visible="true" horizonAlign="center"/> <column id="inventoryLog.description" title="备注" visible="true" horizonAlign="center"/>
<column id="inventoryLog.operator" title="inventoryLog.operator" visible="true" horizonAlign="center"/> <column id="inventoryLog.operator" title="inventoryLog.operator" visible="true" horizonAlign="center"/>

4
src/webapp/WEB-INF/classes/dataSourceContext.xml
View File

@ -27,10 +27,10 @@
<value>jdbc:oracle:thin:@10.137.146.210:1521:orcl</value> <value>jdbc:oracle:thin:@10.137.146.210:1521:orcl</value>
</property> </property>
<property name="username"> <property name="username">
<value>nztest1</value> <value>nzwms</value>
</property> </property>
<property name="password"> <property name="password">
<value>nztest1</value> <value>nzwms</value>
</property> </property>
<!-- <property name="maxActive"> <!-- <property name="maxActive">
<value>200</value> <value>200</value>

3
target/nzwms/WEB-INF/classes/config/origen/enumerate_zh.properties
View File

@ -142,6 +142,9 @@ InventoryLogType.COMPANY_TRANS_OUT=\u8d27\u6743\u8f6c\u51fa
InventoryLogType.COMPANY_TRANS_IN=\u8d27\u6743\u8f6c\u5165 InventoryLogType.COMPANY_TRANS_IN=\u8d27\u6743\u8f6c\u5165
InventoryLogType.-=- InventoryLogType.-=-
IncDec.1=\u589E\u52A0
IncDec.-1=\u51CF\u5C11
#countStatus #countStatus
CountStatus.OPEN=\u6253\u5f00 CountStatus.OPEN=\u6253\u5f00
CountStatus.ACTIVE=\u751f\u6548 CountStatus.ACTIVE=\u751f\u6548

21
target/nzwms/WEB-INF/classes/config/origen/inventory/maintainInventoryLogPage.xml
View File

@ -24,8 +24,21 @@
<text id="item.code" title="item.code" row="3" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/> <text id="item.code" title="item.code" row="3" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/>
<text id="item.name" title="item.name" row="3" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/> <text id="item.name" title="item.name" row="3" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/>
<text id="inventoryLog.operator" title="inventoryLog.operator" row="4" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/> <text id="inventoryLog.operator" title="inventoryLog.operator" row="4" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false" isPrecision="false"/>
<list id="propC3" title="子库" row="4" col="2" width="120px" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="Sublibrary">
<hql><![CDATA[ SELECT
enumerate.enumValue, enumerate.enumValue
FROM Enumerate enumerate
WHERE enumerate.enumType = 'Sublibrary']]></hql>
</list>
<dateRanger id="occurTime" title="inventoryLog.occurTime" row="5" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="occurTime.beginDate" toDate="occurTime.endDate"/> <list id="incOrDec" title="增减类型" row="5" col="1" width="120px" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="IncDec">
<hql><![CDATA[ SELECT
enumerate.enumValue, enumerate.enumValue
FROM Enumerate enumerate
WHERE enumerate.enumType = 'INCDEC']]></hql>
</list>
<dateRanger id="occurTime" title="inventoryLog.occurTime" row="6" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="occurTime.beginDate" toDate="occurTime.endDate"/>
</inputUIs> </inputUIs>
</search> </search>
<datasource type="hql"><![CDATA[SELECT <datasource type="hql"><![CDATA[SELECT
@ -56,7 +69,9 @@
/~relatedBill: AND inventoryLog.relatedBill LIKE upper({relatedBill})~/ /~relatedBill: AND inventoryLog.relatedBill LIKE upper({relatedBill})~/
/~occurTime.beginDate: AND trunc(inventoryLog.occurTime) >= {occurTime.beginDate}~/ /~occurTime.beginDate: AND trunc(inventoryLog.occurTime) >= {occurTime.beginDate}~/
/~occurTime.endDate: AND trunc(inventoryLog.occurTime) <= {occurTime.endDate}~/ /~occurTime.endDate: AND trunc(inventoryLog.occurTime) <= {occurTime.endDate}~/
/~inventoryLog.operator: AND inventoryLog.operator LIKE upper({inventoryLog.operator})~/ /~inventoryLog.operator: AND inventoryLog.operator LIKE upper({inventoryLog.operator})~/
/~propC3: AND inventoryLog.itemKey.lotInfo.propC3 LIKE {propC3}~/
/~incOrDec: AND inventoryLog.incOrDec = cast({incOrDec} as int)~/
ORDER BY inventoryLog.occurTime DESC]]></datasource> ORDER BY inventoryLog.occurTime DESC]]></datasource>
<columns> <columns>
<column id="inventoryLog.id" width="60" title="inventoryLog.id" visible="true" sortIndex="1" sortType="DESC"/> <column id="inventoryLog.id" width="60" title="inventoryLog.id" visible="true" sortIndex="1" sortType="DESC"/>
@ -69,7 +84,7 @@
<column id="inventoryLog.itemKey.lotInfo.propC9" width="120" title="inventory.barCode" visible="true" horizonAlign="center"/> <column id="inventoryLog.itemKey.lotInfo.propC9" width="120" title="inventory.barCode" visible="true" horizonAlign="center"/>
<column id="inventoryLog.itemKey.lotInfo.propC8" width="120" title="颜色" visible="true" horizonAlign="center"/> <column id="inventoryLog.itemKey.lotInfo.propC8" width="120" title="颜色" visible="true" horizonAlign="center"/>
<column id="inventoryLog.itemKey.lotInfo.propC3" width="50" title="lotInfo.propC3" visible="true" horizonAlign="center"/> <column id="inventoryLog.itemKey.lotInfo.propC3" width="50" title="lotInfo.propC3" visible="true" horizonAlign="center"/>
<column id="inventoryLog.incOrDec" title="inventoryLog.incOrDec" width="80" visible="true" horizonAlign="center" format="incDecFormat"/> <column id="inventoryLog.incOrDec" title="inventoryLog.incOrDec" width="80" visible="true" horizonAlign="center" format="incDecFormat" />
<column id="inventoryLog.occurQuantity" title="inventoryLog.occurQuantity" visible="true" horizonAlign="center"/> <column id="inventoryLog.occurQuantity" title="inventoryLog.occurQuantity" visible="true" horizonAlign="center"/>
<column id="inventoryLog.description" title="备注" visible="true" horizonAlign="center"/> <column id="inventoryLog.description" title="备注" visible="true" horizonAlign="center"/>
<column id="inventoryLog.operator" title="inventoryLog.operator" visible="true" horizonAlign="center"/> <column id="inventoryLog.operator" title="inventoryLog.operator" visible="true" horizonAlign="center"/>