kelvin/wms-gj-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Kelvin 2024-12-05 17:36:20 +08:00
commit 889f17d307
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml
View File

@ -82,7 +82,7 @@
BK.SAFE_STOCK, BK.SAFE_STOCK,
BK.STANDARD_QUANTITY, BK.STANDARD_QUANTITY,
BK.AREA_CODE, BK.AREA_CODE,
WSA.AREA_NAME AREA_NAME, WSA.AREA_NAME AREA_NAME,
BK.KNIFE_LIFE, BK.KNIFE_LIFE,
BK.KNIFE_FINE_STATE, BK.KNIFE_FINE_STATE,
BK.IS_LOCKED, BK.IS_LOCKED,
@ -522,15 +522,15 @@
<insert id="batchMdItem"> <insert id="batchMdItem">
insert into MD_ITEM(ITEM_ID, ITEM_CODE, ITEM_NAME, SPECIFICATION, UNIT_OF_MEASURE, ITEM_OR_PRODUCT, insert into MD_ITEM(ITEM_ID, ITEM_CODE, ITEM_NAME, SPECIFICATION, UNIT_OF_MEASURE, ITEM_OR_PRODUCT,
ITEM_TYPE_ID, ITEM_TYPE_CODE, ITEM_TYPE_NAME, ENABLE_FLAG, SAFE_STOCK_FLAG, MIN_STOCK, ITEM_TYPE_ID, ITEM_TYPE_CODE, ITEM_TYPE_NAME, ENABLE_FLAG, SAFE_STOCK_FLAG, MIN_STOCK,
MAX_STOCK, REMARK, ATTR1, ATTR2, ATTR3, ATTR4, CREATE_BY, CREATE_TIME, UPDATE_BY, MAX_STOCK, REMARK, ATTR1, ATTR2, ATTR3, ATTR4, CREATE_BY, CREATE_TIME, UPDATE_BY,
UPDATE_TIME, HIGH_VALUE, UNIT_NAME, MODEL_NUMBER, STANDARD_NUMBER) values UPDATE_TIME, HIGH_VALUE, UNIT_NAME, MODEL_NUMBER, STANDARD_NUMBER) values
<foreach item="item" index="index" collection="list" separator=","> <foreach item="item" index="index" collection="list" separator=",">
(#{item.itemId}, #{item.itemCode}, #{item.itemName}, #{item.specification}, #{item.unitOfMeasure}, (#{item.itemId}, #{item.itemCode}, #{item.itemName}, #{item.specification}, #{item.unitOfMeasure},
#{item.itemOrProduct}, #{item.itemTypeId}, #{item.itemTypeCode}, #{item.itemTypeName}, #{item.enableFlag}, #{item.itemOrProduct}, #{item.itemTypeId}, #{item.itemTypeCode}, #{item.itemTypeName}, #{item.enableFlag},
#{item.safeStockFlag}, #{item.minStock}, #{item.maxStock}, #{item.remark}, #{item.attr1}, #{item.attr2}, #{item.safeStockFlag}, #{item.minStock}, #{item.maxStock}, #{item.remark}, #{item.attr1}, #{item.attr2},
#{item.attr3}, #{item.attr4}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.attr3}, #{item.attr4}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime},
#{item.highValue}, #{item.unitName}, #{item.modelNumber}, #{item.standardNumber}) #{item.highValue}, #{item.unitName}, #{item.modelNumber}, #{item.standardNumber})
</foreach> </foreach>
</insert> </insert>
@ -577,6 +577,7 @@
FROM BASE_KNIFE BK FROM BASE_KNIFE BK
WHERE MBB_BD_MRL_ID = #{mbbBdMrlId} WHERE MBB_BD_MRL_ID = #{mbbBdMrlId}
AND (KNIFE_FINE_STATE = 0 OR KNIFE_FINE_STATE = 1) AND (KNIFE_FINE_STATE = 0 OR KNIFE_FINE_STATE = 1)
AND IS_VALID = 0
</select> </select>
<select id="selectScrapList" resultMap="BaseKnifeResult"> <select id="selectScrapList" resultMap="BaseKnifeResult">