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

耗材字典多个DI信息问题

Browse Source
busUser
anthonywj 3 years ago
parent bac7190547
commit c7512d8bf2
4 changed files with 100 additions and 20 deletions
Show Stats Download Patch File Download Diff File

1
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java
Unescape Escape View File

@ -317,6 +317,7 @@ public class UdiInfoController {
public BaseResponse filterLocalByUuid(FilterUdiInfoRequest productInfoFilterRequest) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(productInfoFilterRequest.getRelId());
productInfoFilterRequest.setRelId(productInfoFilterRequest.getRelId());
List<UdiInfoEntity> udiInfoEntities = udiInfoService.filterAllUdiInfo(productInfoFilterRequest);
if (CollUtil.isNotEmpty(udiInfoEntities)) {
for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {

23
api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java
Unescape Escape View File

@ -24,8 +24,6 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe
@Resource
InvPreInProductDetailDao invPreInProductDetailDao;
@Resource
InvPreInProductDao invPreInProductDao;
@Override
public List<InvProductDetailEntity> findByOriginCode(String code) {
@ -104,16 +102,17 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe
filterInvProductDetailRequest.setMainAction(ConstantType.TYPE_PUT);
List<InvProductDetailEntity> datas = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
if (CollUtil.isEmpty(datas)) {
filterInvProductDetailRequest.setOriginCode(null);
UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
if (StrUtil.isNotEmpty(udiEntity.getBatchNo()))
filterInvProductDetailRequest.setBatchNo(udiEntity.getBatchNo());
else
filterInvProductDetailRequest.setBatchNo("empty");
filterInvProductDetailRequest.setProductionDate(udiEntity.getProduceDate());
filterInvProductDetailRequest.setExpireDate(udiEntity.getExpireDate());
datas = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
// filterInvProductDetailRequest.setOriginCode(null);
// UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
// if (StrUtil.isNotEmpty(udiEntity.getBatchNo()))
// filterInvProductDetailRequest.setBatchNo(udiEntity.getBatchNo());
// else
// filterInvProductDetailRequest.setBatchNo("empty");
//
// filterInvProductDetailRequest.setProductionDate(udiEntity.getProduceDate());
// filterInvProductDetailRequest.setExpireDate(udiEntity.getExpireDate());
// datas = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
return null;
}
if (CollUtil.isNotEmpty(datas)) {
InvProductDetailEntity invProductDetailEntity = datas.get(0);

2
api-admin/src/main/resources/application-dev.properties
Unescape Escape View File

@ -1,7 +1,7 @@
# \u751F\u4EA7\u73AF\u5883
server.port=9996
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://192.168.0.55:3306/spms_za?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_za?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root
spring.datasource.password=123456
spring.datasource.hikari.connection-timeout=60000

94
api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml
Unescape Escape View File

@ -5,26 +5,106 @@
<select id="filterUdiInfo" parameterType="com.glxp.sale.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.sale.admin.entity.basic.UdiInfoEntity">
SELECT * FROM basic_products
SELECT
basic_products.id,
basic_products.nameCode,
basic_products.packRatio,
basic_products.packLevel,
basic_products.bhxjsl,
basic_products.bhzxxsbzsl,
basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm,
basic_products.bzcj,
basic_products.addType,
basic_products.deviceRecordKey,
basic_products.cpmctymc,
basic_products.cplb,
basic_products.flbm,
basic_products.ggxh,
basic_products.qxlb,
basic_products.tyshxydm,
basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs,
basic_products.uuid,
basic_products.sjcpbm,
basic_products.versionNumber,
basic_products.diType,
basic_products.manufactory,
basic_products.productType,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,
basic_products.cpms,
basic_products.originUuid,
basic_products.allowNoBatch,
basic_products.allowNoExpire,
basic_products.allowNoProduct,
basic_products.spmc,
basic_products.cplx,
basic_products.hchzsb,
basic_products.cpdls,
basic_products.basicPrductRemak1,
basic_products.basicPrductRemak2,
basic_products.basicPrductRemak3,
basic_products.basicPrductRemak4,
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8,
basic_udirel.id relId,
basic_udirel.thirdId,
basic_udirel.thirdName,
basic_udirel.isUseDy,
basic_udirel.updateTime,
basic_udirel.thirdId1,
basic_udirel.thirdId2,
basic_udirel.thirdId3,
basic_udirel.thirdId4,
basic_udirel.thirdName1,
basic_udirel.thirdName2,
basic_udirel.thirdName3,
basic_udirel.thirdName4,
basic_udirel.ybbm,
basic_udirel.sptm,
basic_udirel.isDisable,
basic_udirel.isLock,
basic_udirel.mainId,
basic_udirel.lockStatus,
basic_udirel.udplatCode,
basic_udirel.isAdavence,
basic_udirel.supName,
basic_udirel.price,
basic_udirel.modifyTime,
basic_udirel.useMuti,
basic_udirel.useNum,
basic_udirel.measname FROM basic_products
LEFT JOIN basic_udirel on basic_products.uuid=basic_udirel.uuid
<where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
AND basic_products.ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
</if>
<if test="cpmctymc != '' and cpmctymc != null">
AND cpmctymc LIKE concat(#{cpmctymc},'%')
AND basic_products.cpmctymc LIKE concat(#{cpmctymc},'%')
</if>
<if test="nameCode != '' and nameCode != null">
AND nameCode LIKE concat(#{nameCode},'%')
AND basic_products.nameCode LIKE concat(#{nameCode},'%')
</if>
<if test="uuid != '' and uuid != null">
AND uuid = #{uuid}
AND basic_products.uuid = #{uuid}
</if>
<if test="originUuid != '' and originUuid != null">
AND originUuid = #{originUuid}
AND basic_products.originUuid = #{originUuid}
</if>
<if test="sptm != '' and sptm != null">
AND sptm = #{sptm}
AND basic_products.sptm = #{sptm}
</if>
<if test="relId != '' and relId != null">
AND basic_udirel.id = #{relId}
</if>
</where>
</select>

Write Preview
Loading…
Cancel
Save