UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复

Browse Source
lh_dev_fifo
chenhc 7 months ago
parent 3f4ee2f3e7
commit 30080636fd
3 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java
Unescape Escape View File

@ -388,6 +388,8 @@ public class BasicProductsEntity {
@ApiModelProperty(value="是否需要收费 1是；0否") @ApiModelProperty(value="是否需要收费 1是；0否")
private String requireCost; private String requireCost;
private String requireScanCode;
/** /**

8
src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
Unescape Escape View File

@ -335,17 +335,19 @@ FROM
<select id="filterOrderDeptProductOutList" resultType="com.glxp.api.res.inout.IoOrderDetailDeptProductResultResponse"> <select id="filterOrderDeptProductOutList" resultType="com.glxp.api.res.inout.IoOrderDetailDeptProductResultResponse">
SELECT SELECT
nameCode,cpmctymc as coName,batchNo,ggxh as spec, nameCode,cpmctymc as coName,batchNo,ggxh as spec,
SUM( outCount ) AS count SUM( reCount ) AS count
FROM FROM
( (
select ipd.nameCode,bp.cpmctymc,ipd.batchNo,bp.ggxh,ipd.outCount select ipd.nameCode,bp.cpmctymc,ipd.batchNo,bp.ggxh,ipd.reCount
from inv_product_detail ipd from inv_product_detail ipd
inner join basic_udirel on ipd.relId = basic_udirel.id inner join basic_udirel on ipd.relId = basic_udirel.id
inner join basic_products bp on basic_udirel.uuid = bp.uuid inner join basic_products bp on basic_udirel.uuid = bp.uuid
inner join io_order io on io.billNo = ipd.orderId inner join io_order io on io.billNo = ipd.orderId
left join basic_corp on ipd.supId = basic_corp.erpId left join basic_corp on ipd.supId = basic_corp.erpId
<where> <where>
ipd.outCount > 0 <if test="mainAction != null and mainAction != ''">
AND io.mainAction = #{mainAction}
</if>
<if test="nameCode != null and nameCode != ''"> <if test="nameCode != null and nameCode != ''">
AND ipd.nameCode like concat('%', #{nameCode}, '%') AND ipd.nameCode like concat('%', #{nameCode}, '%')
</if> </if>

50
src/main/resources/schemas/schema_v2.4.sql
Unescape Escape View File

@ -3922,31 +3922,31 @@ CREATE TABLE IF NOT EXISTS `device_asset_contract`
ROW_FORMAT = DYNAMIC; ROW_FORMAT = DYNAMIC;
INSERT ignore INTO `basic_bussiness_type`(`id`, `mainAction`, `action`, `name`, `enable`, `remark`, `thirdSysFk`, -- INSERT ignore INTO `basic_bussiness_type`(`id`, `mainAction`, `action`, `name`, `enable`, `remark`, `thirdSysFk`,
`genUnit`, `innerOrder`, `secCheckEnable`, `checkEnable`, `checkUdims`, -- `genUnit`, `innerOrder`, `secCheckEnable`, `checkEnable`, `checkUdims`,
`checkPdaEd`, `checkPdaUn`, `checkPc`, `checkWebNew`, `checkSp`, -- `checkPdaEd`, `checkPdaUn`, `checkPc`, `checkWebNew`, `checkSp`,
`checkChange`, `secCheckUdims`, `secCheckPdaEd`, `secCheckPdaUn`, -- `checkChange`, `secCheckUdims`, `secCheckPdaEd`, `secCheckPdaUn`,
`secCheckPc`, `secCheckWebNew`, `secCheckChange`, `secCheckSp`, `corpType`, -- `secCheckPc`, `secCheckWebNew`, `secCheckChange`, `secCheckSp`, `corpType`,
`supplementOrderType`, `checkBalance`, `secCheckBalance`, `useDyCount`, -- `supplementOrderType`, `checkBalance`, `secCheckBalance`, `useDyCount`,
`expireTip`, `updateTime`, `defaultUnit`, `prefix`, `outToSpms`, -- `expireTip`, `updateTime`, `defaultUnit`, `prefix`, `outToSpms`,
`ullageFill`, `scanPreIn`, `vailInv`, `entrutSpms`, `codeFillCheck`, -- `ullageFill`, `scanPreIn`, `vailInv`, `entrutSpms`, `codeFillCheck`,
`defaultSubInv`, `defaultInv`, `orderVisibleType`, `checkCopy`, -- `defaultSubInv`, `defaultInv`, `orderVisibleType`, `checkCopy`,
`secCheckCopy`, `originAction`, `advanceType`, `changeEnable`, `spUse`, -- `secCheckCopy`, `originAction`, `advanceType`, `changeEnable`, `spUse`,
`preIn`, `preInBack`, `supplementAll`, `createUser`, `createTime`, -- `preIn`, `preInBack`, `supplementAll`, `createUser`, `createTime`,
`updateUser`, `vailDispatch`, `vailGroupBuy`, `busType`, `inStock`, -- `updateUser`, `vailDispatch`, `vailGroupBuy`, `busType`, `inStock`,
`actionType`, `thrCheckEnable`, `thrCheckWebNew`, `thrCheckPdaUn`, -- `actionType`, `thrCheckEnable`, `thrCheckWebNew`, `thrCheckPdaUn`,
`thrCheckPdaEd`, `thrCheckUdims`, `thrCheckPc`, `thrCheckSp`, -- `thrCheckPdaEd`, `thrCheckUdims`, `thrCheckPc`, `thrCheckSp`,
`thrCheckChange`, `thrCheckBalance`, `thrCheckCopy`, `fillCodeRel`, -- `thrCheckChange`, `thrCheckBalance`, `thrCheckCopy`, `fillCodeRel`,
`checkVailDate`, `checkExpire`, `checkCertExpire`, `preInBackAction`, -- `checkVailDate`, `checkExpire`, `checkCertExpire`, `preInBackAction`,
`backPreinType`, `sortNum`, `advancePreIn`, `spaceOut`, `checkReview`, -- `backPreinType`, `sortNum`, `advancePreIn`, `spaceOut`, `checkReview`,
`secCheckReview`, `thrCheckReview`, `editType`, `inPreInBack`, -- `secCheckReview`, `thrCheckReview`, `editType`, `inPreInBack`,
`vailProductAttributes`, `vailHcType`, `checkWebNewType`, `deptNoInvType`, -- `vailProductAttributes`, `vailHcType`, `checkWebNewType`, `deptNoInvType`,
`vailPrescribe`, `inputSick`, `groupBuySplit`, `vailInvBatchNo`, -- `vailPrescribe`, `inputSick`, `groupBuySplit`, `vailInvBatchNo`,
`devInType`, `requireScanCode`, `codeCheck`, `requireCost`) -- `devInType`, `requireScanCode`, `codeCheck`, `requireCost`)
VALUES (1859776049824198656, 'WareHouseIn', 'SC72854426720051', '临床退库（普耗退费）', 1, '', '', 0, 0, 0, 1, 0, 0, 0, 0, 4, 0, -- VALUES (1859776049824198656, 'WareHouseIn', 'SC72854426720051', '临床退库（普耗退费）', 1, '', '', 0, 0, 0, 1, 0, 0, 0, 0, 4, 0,
0, 0, 0, 0, 0, 0, 0, 0, 3, '', 0, 0, 0, 1, '2024-11-22 11:55:24', NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 0, -- 0, 0, 0, 0, 0, 0, 0, 0, 3, '', 0, 0, 0, 1, '2024-11-22 11:55:24', NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 0,
0, 0, NULL, NULL, 0, 0, NULL, 0, 0, NULL, NULL, '1', 0, 0, NULL, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, -- 0, 0, NULL, NULL, 0, 0, NULL, 0, 0, NULL, NULL, '1', 0, 0, NULL, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,
NULL, 1, 999, 0, 0, 0, 0, 0, 1, 1, NULL, 0, 0, 0, 0, 0, 2, 1, 0, b'0', 0, b'0'); -- NULL, 1, 999, 0, 0, 0, 0, 0, 1, 1, NULL, 0, 0, 0, 0, 0, 2, 1, 0, b'0', 0, b'0');
CALL Pro_Temp_ColumnWork('basic_products', 'requireCost', CALL Pro_Temp_ColumnWork('basic_products', 'requireCost',
'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要收费 1是；0否''', 'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要收费 1是；0否''',

Write Preview
Loading…
Cancel
Save