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

Merge remote-tracking branch 'origin/zhairh' into zhairh

Browse Source 
# Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java
#	api-admin/src/main/resources/application-dev.properties
#	api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
feature-order-fix
x_z 2 years ago
parent 08d7c5abd1 6b88b3f244
commit 42e7953ddb
11 changed files with 439 additions and 222 deletions
Show Stats Download Patch File Download Diff File

6
api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java
Unescape Escape View File

@ -491,7 +491,11 @@ public class InvProductsController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
} }
List<InvProductResponse> list = invProductService.getCountInvProductProduct(filterInvProductRequest); List<InvProductResponse> list = invProductService.getCountInvProductProduct(filterInvProductRequest);
return ResultVOUtils.success(list); PageInfo<InvProductResponse> pageInfo = new PageInfo<>(list);
PageSimpleResponse<InvProductResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setList(pageInfo.getList());
pageSimpleResponse.setTotal(pageInfo.getTotal());
return ResultVOUtils.success(pageSimpleResponse);
} }
} }

12
api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java
Unescape Escape View File

@ -66,12 +66,6 @@ public interface UdiRelevanceDao {
*/ */
void importUdiRelevance(@Param("udiRelevanceEntities") List<UdiRelevanceEntity> udiRelevanceEntities); void importUdiRelevance(@Param("udiRelevanceEntities") List<UdiRelevanceEntity> udiRelevanceEntities);
/**
* 查找产品UUID
* @param relId
* @return
*/
String selectUuidById(String relId);
/** /**
* 查询产品ID * 查询产品ID
* *
@ -81,4 +75,10 @@ public interface UdiRelevanceDao {
*/ */
String selectProductId(@Param("nameCode") String nameCode, @Param("orderIdFk") String orderIdFk); String selectProductId(@Param("nameCode") String nameCode, @Param("orderIdFk") String orderIdFk);
/**
* 查找产品UUID
* @param relId
* @return
*/
String selectUuidById(String relId);
} }

2
api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDetailDao.java
Unescape Escape View File

@ -73,7 +73,7 @@ public interface InvCountOrderDetailDao {
* @param nameCode * @param nameCode
* @return * @return
*/ */
InvCountOrderDetail selectByOrderIdAndNameCode(@Param("orderIdFk") String orderIdFk, @Param("nameCode") String nameCode); InvCountOrderDetail selectOrderDetail(@Param("orderIdFk") String orderIdFk, @Param("nameCode") String nameCode, @Param("batchNo") String batchNo);
/** /**
* 查询此盘点单的单据详情 * 查询此盘点单的单据详情

41
api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountCodesServiceImpl.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.admin.service.inventory.impl; package com.glxp.api.admin.service.inventory.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.basic.UdiRelevanceDao; import com.glxp.api.admin.dao.basic.UdiRelevanceDao;
import com.glxp.api.admin.dao.inventory.InvCountCodesDao; import com.glxp.api.admin.dao.inventory.InvCountCodesDao;
@ -8,7 +9,9 @@ import com.glxp.api.admin.dao.inventory.InvCountOrderDetailDao;
import com.glxp.api.admin.entity.basic.UdiEntity; import com.glxp.api.admin.entity.basic.UdiEntity;
import com.glxp.api.admin.entity.inventory.InvCountCodes; import com.glxp.api.admin.entity.inventory.InvCountCodes;
import com.glxp.api.admin.entity.inventory.InvCountOrderDetail; import com.glxp.api.admin.entity.inventory.InvCountOrderDetail;
import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.api.admin.req.inventory.FilterInvCountCodesRequest; import com.glxp.api.admin.req.inventory.FilterInvCountCodesRequest;
import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
import com.glxp.api.admin.service.inventory.InvCountCodesService; import com.glxp.api.admin.service.inventory.InvCountCodesService;
import com.glxp.api.admin.util.FilterUdiUtils; import com.glxp.api.admin.util.FilterUdiUtils;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
@ -54,13 +57,13 @@ public class InvCountCodesServiceImpl implements InvCountCodesService {
} }
UdiEntity udi = FilterUdiUtils.getUdi(list.get(0).getCode()); UdiEntity udi = FilterUdiUtils.getUdi(list.get(0).getCode());
InvCountOrderDetail invCountOrderDetail = invCountOrderDetailDao.selectByOrderIdAndNameCode(list.get(0).getOrderIdFk(), udi.getUdi()); InvCountOrderDetail invCountOrderDetail = invCountOrderDetailDao.selectOrderDetail(list.get(0).getOrderIdFk(), udi.getUdi(), udi.getBatchNo());
if (invCountOrderDetail.getCountNum() == 1) { if (invCountOrderDetail.getCountNum() == 1) {
//条码数量为1，删除此产品的盘点单据详情 //条码数量为1，删除此产品的盘点单据详情
invCountOrderDetailDao.deleteByPrimaryKey(invCountOrderDetail.getId()); invCountOrderDetailDao.deleteByPrimaryKey(invCountOrderDetail.getId());
} else { } else {
//条码数量大于1，将此单据详情的盘点数量 - 1 //条码数量大于1，将此单据详情的盘点数量 - 1
invCountOrderDetail.setCountNum(invCountOrderDetail.getCountNum() - 1); invCountOrderDetail.setCountNum(invCountOrderDetail.getCountNum() - getActCount(udi.getUdi()));
invCountOrderDetailDao.updateByPrimaryKey(invCountOrderDetail); invCountOrderDetailDao.updateByPrimaryKey(invCountOrderDetail);
} }
//删除此条码 //删除此条码
@ -70,20 +73,25 @@ public class InvCountCodesServiceImpl implements InvCountCodesService {
@Override @Override
public BaseResponse addCode(InvCountCodes invCountCodes) { public BaseResponse addCode(InvCountCodes invCountCodes) {
//解析条码
UdiEntity udi = FilterUdiUtils.getUdi(invCountCodes.getCode());
//查询此条码是否重复 //查询此条码是否重复
//判断此产品是否有批次号，如果没有批次号，则直接在单据详情的盘点数量上加1
if (StrUtil.isNotBlank(udi.getBatchNo()) && StrUtil.isNotBlank(udi.getSerialNo())) {
Long count = invCountCodesDao.selectCountByCodeAndOrderId(invCountCodes.getCode(), invCountCodes.getOrderIdFk()); Long count = invCountCodesDao.selectCountByCodeAndOrderId(invCountCodes.getCode(), invCountCodes.getOrderIdFk());
if (count > 0) { if (count > 0) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "条码重复！"); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "条码重复！");
} }
//解析条码 }
UdiEntity udi = FilterUdiUtils.getUdi(invCountCodes.getCode());
//查询单据详情，单据详情添加 //查询单据详情，单据详情添加
InvCountOrderDetail invCountOrderDetail = invCountOrderDetailDao.selectByOrderIdAndNameCode(invCountCodes.getOrderIdFk(), udi.getUdi()); InvCountOrderDetail invCountOrderDetail = invCountOrderDetailDao.selectOrderDetail(invCountCodes.getOrderIdFk(), udi.getUdi(), udi.getBatchNo());
if (null == invCountOrderDetail) { if (null == invCountOrderDetail) {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "当前仓库不存在此产品"); return ResultVOUtils.error(ResultEnum.DATA_NOT, "当前仓库或货位不存在此产品");
} }
invCountOrderDetail.setCountNum(invCountOrderDetail.getCountNum() + 1); invCountOrderDetail.setCountNum(invCountOrderDetail.getCountNum() + getActCount(udi.getUdi()));
invCountCodes.setProductId(invCountOrderDetail.getProductId()); invCountCodes.setProductId(invCountOrderDetail.getProductId());
invCountOrderDetailDao.updateByPrimaryKey(invCountOrderDetail); invCountOrderDetailDao.updateByPrimaryKey(invCountOrderDetail);
invCountCodesDao.insert(invCountCodes); invCountCodesDao.insert(invCountCodes);
@ -95,4 +103,23 @@ public class InvCountCodesServiceImpl implements InvCountCodesService {
return invCountCodesDao.countByOrderId(orderIdFk); return invCountCodesDao.countByOrderId(orderIdFk);
} }
public int getActCount(String nameCode) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setNameCode(nameCode);
List<UdiRelevanceResponse> list = udiRelevanceDao.filterUdiRelevance(null);
UdiRelevanceResponse udiInfoBean = list.get(0);
if (udiInfoBean != null) {
if (udiInfoBean.getIsUseDy() == 1 && udiInfoBean.getDiType() != 2) {
if (udiInfoBean.getBhzxxsbzsl() == 0)
return udiInfoBean.getZxxsbzbhsydysl();
else
return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl();
} else {
return udiInfoBean.getBhzxxsbzsl();
}
}
return 1;
}
} }

4
api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java
Unescape Escape View File

@ -283,7 +283,7 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
log.info("盘点单据：{} 生成盘亏入库单据", invCountOrder.getOrderId()); log.info("盘点单据：{} 生成盘亏入库单据", invCountOrder.getOrderId());
OrderEntity order = createOrder(invCountSettingEntity, invCountOrder, ConstantType.TYPE_OUT); OrderEntity order = createOrder(invCountSettingEntity, invCountOrder, ConstantType.TYPE_OUT);
log.info("盘盈入库单据号：{}", order.getId()); log.info("盘盈入库单据号：{}", order.getId());
inOrderCodes.forEach(warehouseEntity -> { outOrderCodes.forEach(warehouseEntity -> {
warehouseEntity.setOrderId(order.getId()); warehouseEntity.setOrderId(order.getId());
warehouseEntity.setAction(order.getAction()); warehouseEntity.setAction(order.getAction());
warehouseEntity.setFromCorp(order.getFromCorp()); warehouseEntity.setFromCorp(order.getFromCorp());
@ -292,7 +292,7 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
}); });
orderDao.insertOrder(order); orderDao.insertOrder(order);
codesTempDao.insertCodesTemp(inOrderCodes); codesTempDao.insertCodesTemp(outOrderCodes);
log.info("盘亏入库单据生成成功"); log.info("盘亏入库单据生成成功");
} }

6
api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductServiceImpl.java
Unescape Escape View File

@ -146,6 +146,12 @@ public class InvProductServiceImpl implements InvProductService {
@Override @Override
public List<InvProductResponse> getCountInvProductProduct(FilterInvProductRequest filterInvProductRequest) { public List<InvProductResponse> getCountInvProductProduct(FilterInvProductRequest filterInvProductRequest) {
if (null == filterInvProductRequest) {
return Collections.emptyList();
}
if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) {
PageHelper.offsetPage((filterInvProductRequest.getPage() -1 ) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit());
}
return invProductDao.getCountInvProduct(filterInvProductRequest); return invProductDao.getCountInvProduct(filterInvProductRequest);
} }

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

@ -1,6 +1,6 @@
server.port=9991 server.port=9991
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.jdbc-url=jdbc:mysql://192.168.235.137:33306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=root spring.datasource.password=root
spring.datasource.hikari.connection-timeout=60000 spring.datasource.hikari.connection-timeout=60000
@ -14,9 +14,9 @@ UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
spring.redis.database=8 spring.redis.database=8
spring.redis.host=127.0.0.1 spring.redis.host=192.168.235.137
spring.redis.port=6379 spring.redis.port=6379
spring.redis.password= spring.redis.auth=123456
spring.redis.jedis.pool.max-active=8 spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.max-idle=8

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

@ -2,7 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.admin.dao.basic.UdiRelevanceDao"> <mapper namespace="com.glxp.api.admin.dao.basic.UdiRelevanceDao">
<select id="filterUdiRelevance" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest" <select id="filterUdiRelevance" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.api.admin.res.basic.UdiRelevanceResponse"> resultType="com.glxp.api.admin.res.basic.UdiRelevanceResponse">
select select
@ -31,7 +30,7 @@
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid
,basic_products.basicPrductRemak1 ,basic_products.basicPrductRemak1
,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6 ,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6
,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8,basic_products.hchzsb ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8
FROM basic_udirel FROM basic_udirel
inner JOIN basic_products inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid ON basic_products.uuid = basic_udirel.uuid
@ -72,7 +71,9 @@
AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%') AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
</if> </if>
<if test="lastUpdateTime != null and lastUpdateTime != ''"> <if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> <![CDATA[
and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
]]>
</if> </if>
<if test="mainId != '' and mainId != null"> <if test="mainId != '' and mainId != null">
AND mainId = #{mainId} AND mainId = #{mainId}
@ -91,37 +92,82 @@
</if> </if>
</where> </where>
ORDER BY modifyTime DESC ORDER BY modifyTime DESC
</select> </select>
<select id="filterUdiJoinSup" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest" <select id="filterUdiJoinSup" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.api.admin.res.basic.UdiRelevanceResponse"> resultType="com.glxp.api.admin.res.basic.UdiRelevanceResponse">
select select basic_udirel.id,
basic_udirel.id, basic_udirel.thirdId,
basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.isUseDy, basic_udirel.thirdName,
basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4, basic_udirel.isUseDy,
basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4, basic_udirel.thirdId1,
basic_udirel.manufactory,basic_udirel.measname,basic_udirel.ybbm,basic_udirel.sptm,basic_udirel.price, basic_udirel.thirdId2,
basic_udirel.isDisable, basic_udirel.isLock,basic_udirel.lockStatus,basic_udirel.udplatCode, basic_udirel.thirdId3,
basic_udirel.isAdavence,basic_udirel.mainId,basic_products.allowNoBatch, basic_udirel.thirdId4,
basic_udirel.thirdName1,
basic_udirel.thirdName2,
basic_udirel.thirdName3,
basic_udirel.thirdName4,
basic_udirel.manufactory,
basic_udirel.measname,
basic_udirel.ybbm,
basic_udirel.sptm,
basic_udirel.price,
basic_udirel.isDisable,
basic_udirel.isLock,
basic_udirel.lockStatus,
basic_udirel.udplatCode,
basic_udirel.isAdavence,
basic_udirel.mainId,
basic_products.allowNoBatch,
basic_products.allowNoExpire, basic_products.allowNoExpire,
basic_products.allowNoProduct, basic_products.allowNoProduct,
basic_products.nameCode,basic_products.packRatio,basic_products.packLevel, basic_products.nameCode,
basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl, basic_products.packRatio,
basic_products.bhxjcpbm,basic_products.bzcj, basic_products.packLevel,
basic_products.addType,basic_products.deviceRecordKey, basic_products.bhxjsl,
basic_products.cpmctymc,basic_products.cplb, basic_products.bhzxxsbzsl,
basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm, basic_products.zxxsbzbhsydysl,
basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc, basic_products.bhxjcpbm,
basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber, basic_products.bzcj,
basic_products.diType,basic_products.productType,basic_products.scbssfbhph, 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.productType,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh, basic_products.scbssfbhxlh,
basic_products.cpdls, basic_products.cpdls,
basic_products.scbssfbhscrq,basic_corp.name companyName, basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,company_product_relevance.unitFk,basic_products.originUuid basic_corp.name companyName,
,basic_products.basicPrductRemak1 basic_products.scbssfbhsxrq,
,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6 basic_products.cpms,
,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8 basic_udirel.supName,
company_product_relevance.unitFk,
basic_products.originUuid
,
basic_products.basicPrductRemak1
,
basic_products.basicPrductRemak2,
basic_products.basicPrductRemak3,
basic_products.basicPrductRemak4,
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6
,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8
FROM basic_udirel FROM basic_udirel
inner JOIN basic_products inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid ON basic_products.uuid = basic_udirel.uuid
@ -168,7 +214,9 @@
AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%') AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
</if> </if>
<if test="lastUpdateTime != null and lastUpdateTime != ''"> <if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> <![CDATA[
and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
]]>
</if> </if>
<if test="mainId != '' and mainId != null"> <if test="mainId != '' and mainId != null">
AND mainId = #{mainId} AND mainId = #{mainId}
@ -186,35 +234,81 @@
AND nameCode = #{uniqueNameCode} AND nameCode = #{uniqueNameCode}
</if> </if>
</where> </where>
</select> </select>
<select id="filterUdiGp" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest" <select id="filterUdiGp" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.api.admin.res.basic.UdiRelevanceResponse"> resultType="com.glxp.api.admin.res.basic.UdiRelevanceResponse">
select select basic_udirel.id,
basic_udirel.id, basic_udirel.thirdId,
basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.isUseDy, basic_udirel.thirdName,
basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4, basic_udirel.isUseDy,
basic_udirel.ybbm,basic_udirel.sptm,basic_udirel.isDisable, basic_udirel.isLock,basic_udirel.lockStatus, basic_udirel.thirdId1,
basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4, basic_udirel.thirdId2,
basic_udirel.manufactory,basic_udirel.measname,basic_udirel.udplatCode,basic_products.allowNoBatch, basic_udirel.thirdId3,
basic_products.allowNoExpire,basic_products.allowNoProduct, basic_udirel.thirdId4,
basic_udirel.ybbm,
basic_udirel.sptm,
basic_udirel.isDisable,
basic_udirel.isLock,
basic_udirel.lockStatus,
basic_udirel.thirdName1,
basic_udirel.thirdName2,
basic_udirel.thirdName3,
basic_udirel.thirdName4,
basic_udirel.manufactory,
basic_udirel.measname,
basic_udirel.udplatCode,
basic_products.allowNoBatch,
basic_products.allowNoExpire,
basic_products.allowNoProduct,
basic_udirel.price, basic_udirel.price,
basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,basic_products.bhxjsl, basic_products.nameCode,
basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl,basic_products.bhxjcpbm,basic_products.bzcj, basic_products.packRatio,
basic_products.addType,basic_products.deviceRecordKey,basic_products.cpmctymc,basic_products.cplb, basic_products.packLevel,
basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,basic_products.ylqxzcrbarmc, basic_products.bhxjsl,
basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid, basic_products.bhzxxsbzsl,
basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType, basic_products.zxxsbzbhsydysl,
basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph, 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_udirel.mainId,
basic_udirel.mainName,
basic_udirel.isAdavence,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh, basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq, basic_products.scbssfbhscrq,
basic_products.cpdls, basic_products.cpdls,
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid,basic_products.spmc, basic_products.scbssfbhsxrq,
basic_products.cpms,
basic_udirel.supName,
basic_products.originUuid,
basic_products.spmc,
basic_products.basicPrductRemak1 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_products.basicPrductRemak2,
basic_products.basicPrductRemak3,
basic_products.basicPrductRemak4,
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6
,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8
FROM basic_products FROM basic_products
right JOIN basic_udirel right JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid ON basic_products.uuid = basic_udirel.uuid
@ -275,19 +369,24 @@
AND basic_products.originUuid is NULL AND basic_products.originUuid is NULL
</if> </if>
<if test="filterType != null and filterType == 3"> <if test="filterType != null and filterType == 3">
AND (mainId is NULL or mainId = '') and basic_products.originUuid <![CDATA[<>]]> '' AND (mainId is NULL or mainId = '')
and basic_products.originUuid <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 4"> <if test="filterType != null and filterType == 4">
AND thirdId1 is NULL and basic_products.originUuid <![CDATA[<>]]> '' AND thirdId1 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 5"> <if test="filterType != null and filterType == 5">
AND thirdId2 is NULL and basic_products.originUuid <![CDATA[<>]]> '' AND thirdId2 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 6"> <if test="filterType != null and filterType == 6">
AND thirdId3 is NULL and basic_products.originUuid <![CDATA[<>]]> '' AND thirdId3 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 7"> <if test="filterType != null and filterType == 7">
AND thirdId4 is NULL and basic_products.originUuid <![CDATA[<>]]> '' AND thirdId4 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 10"> <if test="filterType != null and filterType == 10">
@ -303,7 +402,6 @@
<if test="id != '' and id != null"> <if test="id != '' and id != null">
AND basic_udirel.id = #{id} AND basic_udirel.id = #{id}
</if> </if>
</where> </where>
ORDER BY modifyTime DESC ORDER BY modifyTime DESC
</select> </select>
@ -311,7 +409,8 @@
<select id="selectByUuid" parameterType="java.lang.String" <select id="selectByUuid" parameterType="java.lang.String"
resultType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity"> resultType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity">
select * FROM basic_udirel select *
FROM basic_udirel
<where> <where>
<if test="uuid != '' and uuid != null"> <if test="uuid != '' and uuid != null">
AND uuid = #{uuid} AND uuid = #{uuid}
@ -322,7 +421,9 @@
<select id="selectByOrigiUuid" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest" <select id="selectByOrigiUuid" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity"> resultType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity">
select * from basic_udirel INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid select *
from basic_udirel
INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid
<where> <where>
<if test="uuid != '' and uuid != null"> <if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid} AND basic_udirel.uuid = #{uuid}
@ -365,7 +466,8 @@
</select> </select>
<select id="selectByThirdId" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest" <select id="selectByThirdId" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity"> resultType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity">
select * FROM basic_udirel select *
FROM basic_udirel
<where> <where>
<if test="thirdId != '' and thirdId != null"> <if test="thirdId != '' and thirdId != null">
AND thirdId = #{thirdId} AND thirdId = #{thirdId}
@ -391,7 +493,8 @@
<select id="selectByDiThirdId" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest" <select id="selectByDiThirdId" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity"> resultType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity">
select * FROM basic_udirel select *
FROM basic_udirel
<where> <where>
<if test="thirdId != '' and thirdId != null"> <if test="thirdId != '' and thirdId != null">
AND ${thirdSys} = #{thirdId} AND ${thirdSys} = #{thirdId}
@ -406,7 +509,8 @@
<select id="filterEntity" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest" <select id="filterEntity" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity"> resultType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity">
select * FROM basic_udirel select *
FROM basic_udirel
<where> <where>
<if test="thirdId != '' and thirdId != null"> <if test="thirdId != '' and thirdId != null">
AND thirdId = #{thirdId} AND thirdId = #{thirdId}
@ -430,7 +534,9 @@
AND mainId = #{mainId} AND mainId = #{mainId}
</if> </if>
<if test="lastUpdateTime != null and lastUpdateTime != ''"> <if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> <![CDATA[
and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
]]>
</if> </if>
</where> </where>
order by modifyTime desc order by modifyTime desc
@ -473,8 +579,7 @@
#{lockStatus}, #{lockStatus},
#{udplatCode}, #{udplatCode},
#{isAdavence}, #{isAdavence},
#{supName}, #{supName},#{price}
#{price}
) )
</insert> </insert>
@ -486,7 +591,7 @@
(id, (id,
thirdId,thirdName,uuid,isUseDy,updateTime,modifyTime, thirdId,thirdName,uuid,isUseDy,updateTime,modifyTime,
thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price,modifyTime
) )
values values
( (
@ -517,7 +622,7 @@
#{udplatCode}, #{udplatCode},
#{isAdavence}, #{isAdavence},
#{supName}, #{supName},
#{price} #{price},#{modifyTime}
) )
</insert> </insert>
@ -527,7 +632,8 @@
WHERE id = #{id} WHERE id = #{id}
</delete> </delete>
<delete id="deleteByIds" parameterType="java.util.List"> <delete id="deleteByIds" parameterType="java.util.List">
DELETE FROM basic_udirel WHERE id in DELETE
FROM basic_udirel WHERE id in
<foreach collection="ids" item="item" open="(" separator="," close=")"> <foreach collection="ids" item="item" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
@ -541,34 +647,87 @@
<update id="updateUdiRelevance" parameterType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity"> <update id="updateUdiRelevance" parameterType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity">
UPDATE basic_udirel UPDATE basic_udirel
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<if test="thirdId != null">thirdId=#{thirdId},</if> <if test="thirdId != null">
<if test="thirdName != null">thirdName=#{thirdName},</if> thirdId=#{thirdId},
<if test="uuid != null">uuid=#{uuid},</if> </if>
<if test="isUseDy != null">isUseDy=#{isUseDy},</if> <if test="thirdName != null">
<if test="thirdId1 != null">thirdId1=#{thirdId1},</if> thirdName=#{thirdName},
<if test="thirdId2 != null">thirdId2=#{thirdId2},</if> </if>
<if test="thirdId3 != null">thirdId3=#{thirdId3},</if> <if test="uuid != null">
<if test="thirdId4 != null">thirdId4=#{thirdId4},</if> uuid=#{uuid},
<if test="thirdName1 != null">thirdName1=#{thirdName1},</if> </if>
<if test="thirdName2 != null">thirdName2=#{thirdName2},</if> <if test="isUseDy != null">
<if test="thirdName3 != null">thirdName3=#{thirdName3},</if> isUseDy=#{isUseDy},
<if test="thirdName4 != null">thirdName4=#{thirdName4},</if> </if>
<if test="manufactory != null">manufactory=#{manufactory},</if> <if test="thirdId1 != null">
<if test="measname != null">measname=#{measname},</if> thirdId1=#{thirdId1},
<if test="ybbm != null">ybbm=#{ybbm},</if> </if>
<if test="sptm != null">sptm=#{sptm},</if> <if test="thirdId2 != null">
<if test="updateTime != null">updateTime=#{updateTime},</if> thirdId2=#{thirdId2},
<if test="modifyTime != null">modifyTime=#{modifyTime},</if> </if>
<if test="isDisable != null">isDisable=#{isDisable},</if> <if test="thirdId3 != null">
<if test="isLock != null">isLock=#{isLock},</if> thirdId3=#{thirdId3},
<if test="mainId != null">mainId=#{mainId},</if> </if>
<if test="lockStatus != null">lockStatus=#{lockStatus},</if> <if test="thirdId4 != null">
<if test="mainName != null">mainName=#{mainName},</if> thirdId4=#{thirdId4},
<if test="udplatCode != null">udplatCode=#{udplatCode},</if> </if>
<if test="isAdavence != null">isAdavence=#{isAdavence},</if> <if test="thirdName1 != null">
<if test="supName != null">supName=#{supName},</if> thirdName1=#{thirdName1},
<if test="price != null">price=#{price},</if> </if>
<if test="thirdName2 != null">
thirdName2=#{thirdName2},
</if>
<if test="thirdName3 != null">
thirdName3=#{thirdName3},
</if>
<if test="thirdName4 != null">
thirdName4=#{thirdName4},
</if>
<if test="manufactory != null">
manufactory=#{manufactory},
</if>
<if test="measname != null">
measname=#{measname},
</if>
<if test="ybbm != null">
ybbm=#{ybbm},
</if>
<if test="sptm != null">
sptm=#{sptm},
</if>
<if test="updateTime != null">
updateTime=#{updateTime},
</if>
<if test="modifyTime != null">
modifyTime=#{modifyTime},
</if>
<if test="isDisable != null">
isDisable=#{isDisable},
</if>
<if test="isLock != null">
isLock=#{isLock},
</if>
<if test="mainId != null">
mainId=#{mainId},
</if>
<if test="lockStatus != null">
lockStatus=#{lockStatus},
</if>
<if test="mainName != null">
mainName=#{mainName},
</if>
<if test="udplatCode != null">
udplatCode=#{udplatCode},
</if>
<if test="isAdavence != null">
isAdavence=#{isAdavence},
</if>
<if test="supName != null">
supName=#{supName},
</if>
<if test="price != null">
price=#{price},
</if>
</trim> </trim>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
@ -589,8 +748,7 @@
</select> </select>
<insert id="importUdiRelevance" parameterType="java.util.List"> <insert id="importUdiRelevance" parameterType="java.util.List">
replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, modifyTime, thirdId1, thirdId2, replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, modifyTime, thirdId1, thirdId2, thirdId3,
thirdId3,
thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, ybbm, sptm, manufactory, thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, ybbm, sptm, manufactory,
measname, isDisable, mainId, mainName, udplatCode,supName,price,modifyTime) measname, isDisable, mainId, mainName, udplatCode,supName,price,modifyTime)
values values
@ -620,14 +778,4 @@
#{item.udplatCode}, #{item.supName}, #{item.price}, #{modifyTime}) #{item.udplatCode}, #{item.supName}, #{item.price}, #{modifyTime})
</foreach> </foreach>
</insert> </insert>
<select id="selectUuidById" resultType="java.lang.String">
select uuid from basic_udirel where id = #{relId}
</select>
<select id="selectProductId" resultType="java.lang.String">
select id
from basic_udirel
where uuid = (select uuid from basic_products where nameCode = #{nameCode} limit 1)
</select>
</mapper> </mapper>

15
api-admin/src/main/resources/mybatis/mapper/inventory/InvCountOrderDetailDao.xml
Unescape Escape View File

@ -321,11 +321,20 @@
and productId = #{productId} and productId = #{productId}
</delete> </delete>
<select id="selectByOrderIdAndNameCode" resultMap="BaseResultMap"> <select id="selectOrderDetail" resultMap="BaseResultMap">
select * select *
from inv_count_order_detail from inv_count_order_detail
where orderIdFk = #{orderIdFk} <where>
and nameCode = #{nameCode} <if test="nameCode != null and nameCode != ''">
AND nameCode = #{nameCode}
</if>
<if test="orderIdFk != null and orderIdFk != ''">
AND orderIdFk = #{orderIdFk}
</if>
<if test="batchNo != null and batchNo != ''">
AND batchNo = #{batchNo}
</if>
</where>
</select> </select>
<select id="selectByOrderId" resultMap="BaseResultMap"> <select id="selectByOrderId" resultMap="BaseResultMap">

27
api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
Unescape Escape View File

@ -187,7 +187,6 @@
<if test="invWarehouseCode != '' and invWarehouseCode != null"> <if test="invWarehouseCode != '' and invWarehouseCode != null">
AND invWarehouseCode = #{invWarehouseCode} AND invWarehouseCode = #{invWarehouseCode}
</if> </if>
<if test="invCodes != null and invCodes.size > 0"> <if test="invCodes != null and invCodes.size > 0">
AND invStorageCode IN AND invStorageCode IN
<foreach collection="invCodes" item="id" index="index" open="(" close=")" separator=","> <foreach collection="invCodes" item="id" index="index" open="(" close=")" separator=",">
@ -361,10 +360,20 @@
<select id="selectProductInfo" resultType="com.glxp.api.admin.entity.inventory.InvProductEntity"> <select id="selectProductInfo" resultType="com.glxp.api.admin.entity.inventory.InvProductEntity">
select * select *
from inv_product from inv_product
where relIdFk = #{productId} <where>
<if test="productId != null and productId != ''">
and relIdFk = #{productId}
</if>
<if test="batchNo != null and batchNo != ''">
and batchNo = #{batchNo} and batchNo = #{batchNo}
</if>
<if test="invStorageCode != null and invStorageCode != ''">
and invStorageCode = #{invStorageCode} and invStorageCode = #{invStorageCode}
</if>
<if test="invWarehouseCode != null and invWarehouseCode != ''">
and invWarehouseCode = #{invWarehouseCode} and invWarehouseCode = #{invWarehouseCode}
</if>
</where>
</select> </select>
<select id="getCountInvProduct" resultType="com.glxp.api.admin.res.inventory.InvProductResponse"> <select id="getCountInvProduct" resultType="com.glxp.api.admin.res.inventory.InvProductResponse">
@ -379,6 +388,9 @@
basic_products.cpmctymc basic_products.cpmctymc
from inv_product_detail from inv_product_detail
left join inv_product on inv_product_detail.productIdFk = inv_product.relIdFk left join inv_product on inv_product_detail.productIdFk = inv_product.relIdFk
and inv_product.batchNo = inv_product_detail.batchNo
and inv_product.invStorageCode = inv_product_detail.invStorageCode
and inv_product.invWarehouseCode = inv_product_detail.invWarehouseCode
left join basic_udirel on inv_product_detail.productIdFk = basic_udirel.id left join basic_udirel on inv_product_detail.productIdFk = basic_udirel.id
left join basic_products on basic_products.uuid = basic_udirel.uuid left join basic_products on basic_products.uuid = basic_udirel.uuid
<where> <where>
@ -391,7 +403,16 @@
<if test="invSpaceCode != null and invSpaceCode != ''"> <if test="invSpaceCode != null and invSpaceCode != ''">
AND inv_product_detail.invSpaceCode = #{invSpaceCode} AND inv_product_detail.invSpaceCode = #{invSpaceCode}
</if> </if>
</where> <if test="nameCode != null and nameCode != ''">
AND inv_product.nameCode like concat('%', #{nameCode}, '%')
</if>
<if test="cpmctymc != null and cpmctymc != ''">
AND basic_products.cpmctymc like concat('%', #{cpmctymc}, '%')
</if>
<if test="batchNo != null and batchNo != ''">
AND inv_product.batchNo like concat('%', #{batchNo}, '%')
</if>
group by inv_product_detail.productIdFk, inv_product_detail.batchNo group by inv_product_detail.productIdFk, inv_product_detail.batchNo
</where>
</select> </select>
</mapper> </mapper>

4
api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml
Unescape Escape View File

@ -359,7 +359,9 @@
left join basic_products bp on bp.uuid = bu.uuid left join basic_products bp on bp.uuid = bu.uuid
left join inv_warehouse on pd.invStorageCode = inv_warehouse.code left join inv_warehouse on pd.invStorageCode = inv_warehouse.code
left join inv_warehouse_sub on pd.invWarehouseCode = inv_warehouse_sub.code left join inv_warehouse_sub on pd.invWarehouseCode = inv_warehouse_sub.code
left join inv_space on pd.invSpaceCode = inv_space.code left join inv_space
on pd.invSpaceCode = inv_space.code and inv_space.invStorageCode = pd.invStorageCode and
inv_space.invWarehouseCode = pd.invWarehouseCode
<where> <where>
<if test="invStorageCode != null and invStorageCode != ''"> <if test="invStorageCode != null and invStorageCode != ''">
AND pd.invStorageCode = #{invStorageCode} AND pd.invStorageCode = #{invStorageCode}

Write Preview
Loading…
Cancel
Save