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

1.添加盘点单据接口

Browse Source
feature-order-fix
x_z 3 years ago
parent 27b57673bd
commit f8fcfb6d84
16 changed files with 726 additions and 300 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,13 +1,17 @@
package com.glxp.api.admin.controller.inventory; package com.glxp.api.admin.controller.inventory;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.entity.inventory.InvCountCodes; import com.glxp.api.admin.entity.inventory.InvCountCodes;
import com.glxp.api.admin.req.inventory.FilterInvCountCodesRequest; import com.glxp.api.admin.req.inventory.FilterInvCountCodesRequest;
import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.service.inventory.InvCountCodesService; import com.glxp.api.admin.service.inventory.InvCountCodesService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -38,5 +42,32 @@ public class InvCountCodesController {
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
/**
* 移除条码
*
* @param codesRequest
* @return
*/
@PostMapping("/invCount/codes/deleteCode")
public BaseResponse deleteCode(FilterInvCountCodesRequest codesRequest) {
if (null == codesRequest || StrUtil.isBlank(codesRequest.getOrderIdFk()) || StrUtil.isBlank(codesRequest.getProductId()) || StrUtil.isBlank(codesRequest.getCode())) {
return ResultVOUtils.success(ResultEnum.PARAM_VERIFY_FALL);
}
return invCountCodesService.deleteCode(codesRequest);
}
/**
* 添加条码
*
* @param invCountCodes
* @return
*/
@PostMapping("/invCount/codes/addCode")
public BaseResponse addCode(@RequestBody InvCountCodes invCountCodes) {
if (null != invCountCodes || StrUtil.isBlank(invCountCodes.getProductId()) || StrUtil.isBlank(invCountCodes.getProductId())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
return invCountCodesService.addCode(invCountCodes);
}
} }

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

@ -75,8 +75,8 @@ public class InvCountOrderController {
if (null == invCountOrderRequest.getInvCountOrder().getInvStorageCode() || null == invCountOrderRequest.getInvCountOrder().getInvWarehouseCode() || null == invCountOrderRequest.getInvCountOrder().getInvSpaceCode()) { if (null == invCountOrderRequest.getInvCountOrder().getInvStorageCode() || null == invCountOrderRequest.getInvCountOrder().getInvWarehouseCode() || null == invCountOrderRequest.getInvCountOrder().getInvSpaceCode()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
} }
invCountOrderService.saveCountOrder(invCountOrderRequest); String orderId = invCountOrderService.saveCountOrder(invCountOrderRequest);
return ResultVOUtils.success(); return ResultVOUtils.success(orderId);
} }
/** /**

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

@ -1,14 +1,19 @@
package com.glxp.api.admin.controller.inventory; package com.glxp.api.admin.controller.inventory;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.entity.inventory.InvCountOrderDetail;
import com.glxp.api.admin.req.inventory.FilterInvCountOrderDetailRequest; import com.glxp.api.admin.req.inventory.FilterInvCountOrderDetailRequest;
import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.inventory.InvCountOrderDetailResponse; import com.glxp.api.admin.res.inventory.InvCountOrderDetailResponse;
import com.glxp.api.admin.service.inventory.InvCountOrderDetailService; import com.glxp.api.admin.service.inventory.InvCountOrderDetailService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -31,7 +36,7 @@ public class InvCountOrderDetailController {
*/ */
@GetMapping("/invCount/order/detail/filter") @GetMapping("/invCount/order/detail/filter")
public BaseResponse filterList(FilterInvCountOrderDetailRequest detailRequest) { public BaseResponse filterList(FilterInvCountOrderDetailRequest detailRequest) {
List<InvCountOrderDetailResponse> list = invCountOrderDetailService.filterCountDetail(detailRequest); List<InvCountOrderDetailResponse> list = invCountOrderDetailService.filterCountDetail(detailRequest);
PageInfo<InvCountOrderDetailResponse> pageInfo = new PageInfo<>(list); PageInfo<InvCountOrderDetailResponse> pageInfo = new PageInfo<>(list);
PageSimpleResponse<InvCountOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<InvCountOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
@ -39,4 +44,32 @@ public class InvCountOrderDetailController {
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
/**
* 删除盘点单据详情
*
* @param detailRequest
* @return
*/
@PostMapping("/invCount/order/detail/deleteOrderDetail")
public BaseResponse deleteOrderDetail(FilterInvCountOrderDetailRequest detailRequest) {
if (null == detailRequest || null == detailRequest.getId()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
return invCountOrderDetailService.deleteOrderDetail(detailRequest);
}
/**
* 添加产品详情
*
* @param invCountOrderDetail
* @return
*/
@PostMapping("/invCount/order/detail/addCountOrderDetail")
public BaseResponse addCountOrderDetail(@RequestBody InvCountOrderDetail invCountOrderDetail) {
if (null == invCountOrderDetail || StrUtil.isBlank(invCountOrderDetail.getOrderIdFk()) || StrUtil.isBlank(invCountOrderDetail.getProductId())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
return invCountOrderDetailService.addCountOrderDetail(invCountOrderDetail);
}
} }

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

@ -66,4 +66,13 @@ public interface UdiRelevanceDao {
*/ */
void importUdiRelevance(@Param("udiRelevanceEntities") List<UdiRelevanceEntity> udiRelevanceEntities); void importUdiRelevance(@Param("udiRelevanceEntities") List<UdiRelevanceEntity> udiRelevanceEntities);
/**
* 查询产品ID
*
* @param nameCode
* @param orderIdFk
* @return
*/
String selectProductId(@Param("nameCode") String nameCode, @Param("orderIdFk") String orderIdFk);
} }

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

@ -46,8 +46,15 @@ public interface InvCountOrderDao {
* *
* @param invStorageCode 仓库编码 * @param invStorageCode 仓库编码
* @param invWarehouseCode 分库编码 * @param invWarehouseCode 分库编码
* @param invSpaceCode 货位号 * @param invSpaceCode 货位号
* @return * @return
*/ */
Integer countBySpaceCode(@Param("invStorageCode") String invStorageCode, @Param("invWarehouseCode") String invWarehouseCode, @Param("invSpaceCode") String invSpaceCode); Integer countBySpaceCode(@Param("invStorageCode") String invStorageCode, @Param("invWarehouseCode") String invWarehouseCode, @Param("invSpaceCode") String invSpaceCode);
/**
* 根据盘点单号更新单据信息
*
* @param invCountOrder
*/
void updateByOrderId(InvCountOrder invCountOrder);
} }

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

@ -58,4 +58,20 @@ public interface InvCountOrderDetailDao {
*/ */
List<InvCountOrderDetailResponse> filterCountDetail(FilterInvCountOrderDetailRequest detailRequest); List<InvCountOrderDetailResponse> filterCountDetail(FilterInvCountOrderDetailRequest detailRequest);
/**
* 查询盘点单据详情
*
* @param orderIdFk
* @param productId
* @return
*/
InvCountOrderDetail selectByOrderIdAndProductId(@Param("orderIdFk") String orderIdFk, @Param("productId") String productId);
/**
* 根据产品ID和盘点单号删除条码
*
* @param orderIdFk
* @param productId
*/
void deleteByOrderIdAndProductId(@Param("orderIdFk") String orderIdFk, @Param("productId") String productId);
} }

3
api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountOrderDetailRequest.java
Unescape Escape View File

@ -9,10 +9,11 @@ import lombok.Data;
@Data @Data
public class FilterInvCountOrderDetailRequest extends ListPageRequest { public class FilterInvCountOrderDetailRequest extends ListPageRequest {
private Integer id;
/** /**
* 盘点单号 * 盘点单号
*/ */
private String orderIdFk; private String orderIdFk;
} }

17
api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountCodesService.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.api.admin.service.inventory;
import com.glxp.api.admin.entity.inventory.InvCountCodes; import com.glxp.api.admin.entity.inventory.InvCountCodes;
import com.glxp.api.admin.req.inventory.FilterInvCountCodesRequest; import com.glxp.api.admin.req.inventory.FilterInvCountCodesRequest;
import com.glxp.api.common.res.BaseResponse;
import java.util.List; import java.util.List;
@ -17,4 +18,20 @@ public interface InvCountCodesService {
* @return * @return
*/ */
List<InvCountCodes> filterList(FilterInvCountCodesRequest codesRequest); List<InvCountCodes> filterList(FilterInvCountCodesRequest codesRequest);
/**
* 盘点单据移除条码
*
* @param codesRequest
* @return
*/
BaseResponse deleteCode(FilterInvCountCodesRequest codesRequest);
/**
* 添加条码
*
* @param invCountCodes
* @return
*/
BaseResponse addCode(InvCountCodes invCountCodes);
} }

17
api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountOrderDetailService.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.glxp.api.admin.service.inventory;
import com.glxp.api.admin.entity.inventory.InvCountOrderDetail; import com.glxp.api.admin.entity.inventory.InvCountOrderDetail;
import com.glxp.api.admin.req.inventory.FilterInvCountOrderDetailRequest; import com.glxp.api.admin.req.inventory.FilterInvCountOrderDetailRequest;
import com.glxp.api.admin.res.inventory.InvCountOrderDetailResponse; import com.glxp.api.admin.res.inventory.InvCountOrderDetailResponse;
import com.glxp.api.common.res.BaseResponse;
import java.util.List; import java.util.List;
@ -19,4 +20,20 @@ public interface InvCountOrderDetailService {
* @return * @return
*/ */
List<InvCountOrderDetailResponse> filterCountDetail(FilterInvCountOrderDetailRequest detailRequest); List<InvCountOrderDetailResponse> filterCountDetail(FilterInvCountOrderDetailRequest detailRequest);
/**
* 删除盘点单据详情
*
* @param detailRequest
* @return
*/
BaseResponse deleteOrderDetail(FilterInvCountOrderDetailRequest detailRequest);
/**
* 添加单据详情
*
* @param invCountOrderDetail
* @return
*/
BaseResponse addCountOrderDetail(InvCountOrderDetail invCountOrderDetail);
} }

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

@ -32,7 +32,7 @@ public interface InvCountOrderService {
* *
* @param invCountOrderRequest * @param invCountOrderRequest
*/ */
void saveCountOrder(AddInvCountOrderRequest invCountOrderRequest); String saveCountOrder(AddInvCountOrderRequest invCountOrderRequest);
/** /**
* 盘点单据提交审核 * 盘点单据提交审核

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

@ -1,10 +1,19 @@
package com.glxp.api.admin.service.inventory.impl; package com.glxp.api.admin.service.inventory.impl;
import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.basic.UdiRelevanceDao;
import com.glxp.api.admin.dao.inventory.InvCountCodesDao; import com.glxp.api.admin.dao.inventory.InvCountCodesDao;
import com.glxp.api.admin.dao.inventory.InvCountOrderDetailDao;
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.req.inventory.FilterInvCountCodesRequest; import com.glxp.api.admin.req.inventory.FilterInvCountCodesRequest;
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.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -20,6 +29,10 @@ public class InvCountCodesServiceImpl implements InvCountCodesService {
@Resource @Resource
private InvCountCodesDao invCountCodesDao; private InvCountCodesDao invCountCodesDao;
@Resource
private InvCountOrderDetailDao invCountOrderDetailDao;
@Resource
private UdiRelevanceDao udiRelevanceDao;
@Override @Override
public List<InvCountCodes> filterList(FilterInvCountCodesRequest codesRequest) { public List<InvCountCodes> filterList(FilterInvCountCodesRequest codesRequest) {
@ -31,4 +44,41 @@ public class InvCountCodesServiceImpl implements InvCountCodesService {
} }
return invCountCodesDao.filterList(codesRequest); return invCountCodesDao.filterList(codesRequest);
} }
@Override
public BaseResponse deleteCode(FilterInvCountCodesRequest codesRequest) {
//查询盘点单据码详情
List<InvCountCodes> list = invCountCodesDao.filterList(codesRequest);
if (CollUtil.isEmpty(list)) {
return ResultVOUtils.error(ResultEnum.DATA_NOT);
}
InvCountOrderDetail invCountOrderDetail = invCountOrderDetailDao.selectByOrderIdAndProductId(list.get(0).getOrderIdFk(), list.get(0).getProductId());
if (list.size() == 1) {
//条码数量为1，删除此产品的盘点单据详情
invCountOrderDetailDao.deleteByPrimaryKey(invCountOrderDetail.getId());
} else {
//条码数量大于1，将此单据详情的盘点数量 - 1
invCountOrderDetail.setCountNum(invCountOrderDetail.getCountNum() - 1);
invCountOrderDetailDao.updateByPrimaryKey(invCountOrderDetail);
}
//删除此条码
invCountCodesDao.deleteByPrimaryKey(list.get(0).getId());
return ResultVOUtils.success();
}
@Override
public BaseResponse addCode(InvCountCodes invCountCodes) {
//解析条码
UdiEntity udi = FilterUdiUtils.getUdi(invCountCodes.getCode());
String productId = udiRelevanceDao.selectProductId(udi.getUdi(), invCountCodes.getOrderIdFk());
//查询单据详情，单据详情添加
InvCountOrderDetail invCountOrderDetail = invCountOrderDetailDao.selectByOrderIdAndProductId(invCountCodes.getOrderIdFk(), productId);
invCountOrderDetail.setCountNum(invCountOrderDetail.getCountNum() + 1);
invCountCodes.setProductId(productId);
invCountOrderDetailDao.updateByPrimaryKey(invCountOrderDetail);
invCountCodesDao.insert(invCountCodes);
return ResultVOUtils.success(invCountOrderDetail);
}
} }

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

@ -5,8 +5,10 @@ import com.glxp.api.admin.dao.inventory.InvCountOrderDetailDao;
import com.glxp.api.admin.entity.inventory.InvCountOrderDetail; import com.glxp.api.admin.entity.inventory.InvCountOrderDetail;
import com.glxp.api.admin.req.inventory.FilterInvCountOrderDetailRequest; import com.glxp.api.admin.req.inventory.FilterInvCountOrderDetailRequest;
import com.glxp.api.admin.res.inventory.InvCountOrderDetailResponse; import com.glxp.api.admin.res.inventory.InvCountOrderDetailResponse;
import com.glxp.api.admin.res.inventory.InvCountOrderResponse;
import com.glxp.api.admin.service.inventory.InvCountOrderDetailService; import com.glxp.api.admin.service.inventory.InvCountOrderDetailService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -44,4 +46,23 @@ public class InvCountOrderDetailServiceImpl implements InvCountOrderDetailServic
} }
return invCountOrderDetailDao.filterCountDetail(detailRequest); return invCountOrderDetailDao.filterCountDetail(detailRequest);
} }
@Override
public BaseResponse deleteOrderDetail(FilterInvCountOrderDetailRequest detailRequest) {
InvCountOrderDetail invCountOrderDetail = invCountOrderDetailDao.selectByPrimaryKey(detailRequest.getId());
if (null == invCountOrderDetail) {
return ResultVOUtils.error(ResultEnum.DATA_NOT);
}
//删除盘点单据详情
invCountOrderDetailDao.deleteByPrimaryKey(detailRequest.getId());
//删除盘点单据详情的条码数据
invCountOrderDetailDao.deleteByOrderIdAndProductId(detailRequest.getOrderIdFk(), invCountOrderDetail.getProductId());
return ResultVOUtils.success();
}
@Override
public BaseResponse addCountOrderDetail(InvCountOrderDetail invCountOrderDetail) {
return null;
}
} }

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

@ -1,8 +1,8 @@
package com.glxp.api.admin.service.inventory.impl; package com.glxp.api.admin.service.inventory.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.constant.Constant; import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.dao.inventory.InvCountCodesDao; import com.glxp.api.admin.dao.inventory.InvCountCodesDao;
@ -10,8 +10,6 @@ import com.glxp.api.admin.dao.inventory.InvCountOrderDao;
import com.glxp.api.admin.dao.inventory.InvCountOrderDetailDao; import com.glxp.api.admin.dao.inventory.InvCountOrderDetailDao;
import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.inventory.InvCountOrder; import com.glxp.api.admin.entity.inventory.InvCountOrder;
import com.glxp.api.admin.entity.inventory.InvCountOrderDetail;
import com.glxp.api.admin.entity.inventory.InvProductEntity;
import com.glxp.api.admin.req.inventory.AddInvCountOrderRequest; import com.glxp.api.admin.req.inventory.AddInvCountOrderRequest;
import com.glxp.api.admin.req.inventory.FilterInvCountOrderRequest; import com.glxp.api.admin.req.inventory.FilterInvCountOrderRequest;
import com.glxp.api.admin.res.inventory.InvCountOrderResponse; import com.glxp.api.admin.res.inventory.InvCountOrderResponse;
@ -66,29 +64,23 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
} }
@Override @Override
public void saveCountOrder(AddInvCountOrderRequest invCountOrderRequest) { public String saveCountOrder(AddInvCountOrderRequest invCountOrderRequest) {
InvCountOrder invCountOrder = invCountOrderRequest.getInvCountOrder(); InvCountOrder invCountOrder = invCountOrderRequest.getInvCountOrder();
//封装相关数据 //封装相关数据
invCountOrder.setStatus(0); //未提交 invCountOrder.setStatus(0); //未提交
//生成单据号
String orderNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.COUNT_ORDER, "yyyyMMdd"));
invCountOrder.setOrderId(orderNo); //盘点单号
AuthAdmin user = customerService.getUserBean();
invCountOrder.setCreateUser(user.getUserName());
invCountOrderDao.insert(invCountOrder);
List<InvProductEntity> invProductList = invCountOrderRequest.getInvProductList(); String orderId = null;
//根据库存产品信息生成盘点单据详情 if (StrUtil.isBlank(invCountOrder.getOrderId())) {
for (InvProductEntity invProductEntity : invProductList) { //生成单据号
InvCountOrderDetail countOrderDetail = new InvCountOrderDetail(); orderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.COUNT_ORDER, "yyyyMMdd"));
BeanUtil.copyProperties(invProductEntity, countOrderDetail); invCountOrder.setOrderId(orderId); //盘点单号
countOrderDetail.setOrderIdFk(String.valueOf(invCountOrder.getId())); AuthAdmin user = customerService.getUserBean();
countOrderDetail.setInvNum(invProductEntity.getInCount() - invProductEntity.getOutCount()); invCountOrder.setCreateUser(user.getUserName());
countOrderDetail.setProduceDate(invProductEntity.getProductionDate()); invCountOrderDao.insert(invCountOrder);
countOrderDetail.setProductId(invProductEntity.getRelIdFk()); } else {
invCountOrderDetailDao.insert(countOrderDetail); invCountOrderDao.updateByOrderId(invCountOrder);
} }
return orderId;
} }
@Override @Override

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

@ -2,54 +2,96 @@
<!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 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.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_products.allowNoExpire, basic_udirel.thirdName1,
basic_products.allowNoProduct, basic_udirel.thirdName2,
basic_udirel.price, basic_udirel.thirdName3,
basic_products.nameCode,basic_products.packRatio,basic_products.packLevel, basic_udirel.thirdName4,
basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl, basic_udirel.manufactory,
basic_products.bhxjcpbm,basic_products.bzcj, basic_udirel.measname,
basic_products.addType,basic_products.deviceRecordKey, basic_udirel.ybbm,
basic_products.cpmctymc,basic_products.cplb, basic_udirel.sptm,
basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm, basic_udirel.isDisable,
basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc, basic_udirel.isLock,
basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber, basic_udirel.lockStatus,
basic_products.diType,basic_products.productType,basic_products.scbssfbhph, basic_udirel.udplatCode,
basic_products.scbssfbhxlh, basic_udirel.isAdavence,
basic_products.scbssfbhscrq, basic_udirel.mainId,
basic_products.cpdls, basic_products.allowNoBatch,
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid basic_products.allowNoExpire,
,basic_products.basicPrductRemak1 basic_products.allowNoProduct,
,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6 basic_udirel.price,
,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8 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.productType,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.cpdls,
basic_products.scbssfbhsxrq,
basic_products.cpms,
basic_udirel.supName,
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
<where> <where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null"> <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat('%',#{ylqxzcrbarmc},'%') AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
</if> </if>
<if test="supName != '' and supName != null"> <if test="supName != '' and supName != null">
AND supName LIKE concat('%',#{supName},'%') AND supName LIKE concat('%', #{supName}, '%')
</if> </if>
<if test="cpmctymc != '' and cpmctymc != null"> <if test="cpmctymc != '' and cpmctymc != null">
AND cpmctymc LIKE concat('%',#{cpmctymc},'%') AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
</if> </if>
<if test="nameCode != '' and nameCode != null"> <if test="nameCode != '' and nameCode != null">
AND nameCode LIKE concat(#{nameCode},'%') AND nameCode LIKE concat(#{nameCode}, '%')
</if> </if>
<if test="thirdId != '' and thirdId != null"> <if test="thirdId != '' and thirdId != null">
AND thirdId LIKE concat(#{thirdId},'%') AND thirdId LIKE concat(#{thirdId}, '%')
</if> </if>
<if test="uuid != '' and uuid != null"> <if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid} AND basic_udirel.uuid = #{uuid}
@ -60,8 +102,8 @@
<if test="udplatCode != '' and udplatCode != null"> <if test="udplatCode != '' and udplatCode != null">
AND basic_udirel.udplatCode = #{udplatCode} AND basic_udirel.udplatCode = #{udplatCode}
</if> </if>
<if test=" diType != null"> <if test="diType != null">
AND basic_products.diType= #{diType} AND basic_products.diType = #{diType}
</if> </if>
<if test="lockStatus != '' and lockStatus != null"> <if test="lockStatus != '' and lockStatus != null">
@ -69,19 +111,21 @@
</if> </if>
<if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null"> <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
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}
</if> </if>
<if test="unionFilterStr != '' and unionFilterStr != null"> <if test="unionFilterStr != '' and unionFilterStr != null">
or basic_products.cpmctymc LIKE concat('%',#{unionFilterStr},'%') or basic_products.cpmctymc LIKE concat('%', #{unionFilterStr}, '%')
or basic_products.ylqxzcrbarmc LIKE concat('%',#{unionFilterStr},'%') or basic_products.ylqxzcrbarmc LIKE concat('%', #{unionFilterStr}, '%')
or basic_products.ggxh LIKE concat('%',#{unionFilterStr},'%') or basic_products.ggxh LIKE concat('%', #{unionFilterStr}, '%')
or basic_products.zczbhhzbapzbh LIKE concat('%',#{unionFilterStr},'%') or basic_products.zczbhhzbapzbh LIKE concat('%', #{unionFilterStr}, '%')
</if> </if>
<if test="isAdavence != '' and isAdavence != null"> <if test="isAdavence != '' and isAdavence != null">
AND isAdavence = #{isAdavence} AND isAdavence = #{isAdavence}
@ -91,58 +135,103 @@
</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_products.allowNoExpire, basic_udirel.thirdName1,
basic_products.allowNoProduct, basic_udirel.thirdName2,
basic_products.nameCode,basic_products.packRatio,basic_products.packLevel, basic_udirel.thirdName3,
basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl, basic_udirel.thirdName4,
basic_products.bhxjcpbm,basic_products.bzcj, basic_udirel.manufactory,
basic_products.addType,basic_products.deviceRecordKey, basic_udirel.measname,
basic_products.cpmctymc,basic_products.cplb, basic_udirel.ybbm,
basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm, basic_udirel.sptm,
basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc, basic_udirel.price,
basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber, basic_udirel.isDisable,
basic_products.diType,basic_products.productType,basic_products.scbssfbhph, basic_udirel.isLock,
basic_products.scbssfbhxlh, basic_udirel.lockStatus,
basic_products.cpdls, basic_udirel.udplatCode,
basic_products.scbssfbhscrq,basic_corp.name companyName, basic_udirel.isAdavence,
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,company_product_relevance.unitFk,basic_products.originUuid basic_udirel.mainId,
,basic_products.basicPrductRemak1 basic_products.allowNoBatch,
,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6 basic_products.allowNoExpire,
,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8 basic_products.allowNoProduct,
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.productType,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.cpdls,
basic_products.scbssfbhscrq,
basic_corp.name companyName,
basic_products.scbssfbhsxrq,
basic_products.cpms,
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
left join company_product_relevance left join company_product_relevance
on basic_udirel.id = company_product_relevance.udiRlIdFk on basic_udirel.id = company_product_relevance.udiRlIdFk
left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
<where> <where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null"> <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat('%',#{ylqxzcrbarmc},'%') AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
</if> </if>
<if test="supName != '' and supName != null"> <if test="supName != '' and supName != null">
AND supName LIKE concat('%',#{supName},'%') AND supName LIKE concat('%', #{supName}, '%')
</if> </if>
<if test="cpmctymc != '' and cpmctymc != null"> <if test="cpmctymc != '' and cpmctymc != null">
AND cpmctymc LIKE concat('%',#{cpmctymc},'%') AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
</if> </if>
<if test="nameCode != '' and nameCode != null"> <if test="nameCode != '' and nameCode != null">
AND nameCode LIKE concat(#{nameCode},'%') AND nameCode LIKE concat(#{nameCode}, '%')
</if> </if>
<if test="thirdId != '' and thirdId != null"> <if test="thirdId != '' and thirdId != null">
AND thirdId LIKE concat(#{thirdId},'%') AND thirdId LIKE concat(#{thirdId}, '%')
</if> </if>
<if test="uuid != '' and uuid != null"> <if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid} AND basic_udirel.uuid = #{uuid}
@ -156,8 +245,8 @@
<if test="udplatCode != '' and udplatCode != null"> <if test="udplatCode != '' and udplatCode != null">
AND basic_udirel.udplatCode = #{udplatCode} AND basic_udirel.udplatCode = #{udplatCode}
</if> </if>
<if test=" diType != null"> <if test="diType != null">
AND basic_products.diType= #{diType} AND basic_products.diType = #{diType}
</if> </if>
<if test="lockStatus != '' and lockStatus != null"> <if test="lockStatus != '' and lockStatus != null">
@ -165,19 +254,21 @@
</if> </if>
<if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null"> <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
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}
</if> </if>
<if test="unionFilterStr != '' and unionFilterStr != null"> <if test="unionFilterStr != '' and unionFilterStr != null">
or basic_products.cpmctymc LIKE concat('%',#{unionFilterStr},'%') or basic_products.cpmctymc LIKE concat('%', #{unionFilterStr}, '%')
or basic_products.ylqxzcrbarmc LIKE concat('%',#{unionFilterStr},'%') or basic_products.ylqxzcrbarmc LIKE concat('%', #{unionFilterStr}, '%')
or basic_products.ggxh LIKE concat('%',#{unionFilterStr},'%') or basic_products.ggxh LIKE concat('%', #{unionFilterStr}, '%')
or basic_products.zczbhhzbapzbh LIKE concat('%',#{unionFilterStr},'%') or basic_products.zczbhhzbapzbh LIKE concat('%', #{unionFilterStr}, '%')
</if> </if>
<if test="isAdavence != '' and isAdavence != null"> <if test="isAdavence != '' and isAdavence != null">
AND isAdavence = #{isAdavence} AND isAdavence = #{isAdavence}
@ -186,70 +277,116 @@
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.price, basic_udirel.ybbm,
basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,basic_products.bhxjsl, basic_udirel.sptm,
basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl,basic_products.bhxjcpbm,basic_products.bzcj, basic_udirel.isDisable,
basic_products.addType,basic_products.deviceRecordKey,basic_products.cpmctymc,basic_products.cplb, basic_udirel.isLock,
basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,basic_products.ylqxzcrbarmc, basic_udirel.lockStatus,
basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid, basic_udirel.thirdName1,
basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType, basic_udirel.thirdName2,
basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph, basic_udirel.thirdName3,
basic_products.scbssfbhxlh, basic_udirel.thirdName4,
basic_products.scbssfbhscrq, basic_udirel.manufactory,
basic_products.cpdls, basic_udirel.measname,
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid,basic_products.spmc, basic_udirel.udplatCode,
basic_products.basicPrductRemak1 basic_products.allowNoBatch,
,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6 basic_products.allowNoExpire,
,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8 basic_products.allowNoProduct,
basic_udirel.price,
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_udirel.mainId,
basic_udirel.mainName,
basic_udirel.isAdavence,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.cpdls,
basic_products.scbssfbhsxrq,
basic_products.cpms,
basic_udirel.supName,
basic_products.originUuid,
basic_products.spmc,
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_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
<where> <where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null"> <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat('%',#{ylqxzcrbarmc},'%') AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
</if> </if>
<if test="supName != '' and supName != null"> <if test="supName != '' and supName != null">
AND supName LIKE concat('%',#{supName},'%') AND supName LIKE concat('%', #{supName}, '%')
</if> </if>
<if test="cpmctymc != '' and cpmctymc != null"> <if test="cpmctymc != '' and cpmctymc != null">
AND cpmctymc LIKE concat('%',#{cpmctymc},'%') AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
</if> </if>
<if test="ggxh != '' and ggxh != null"> <if test="ggxh != '' and ggxh != null">
AND ggxh LIKE concat('%',#{ggxh},'%') AND ggxh LIKE concat('%', #{ggxh}, '%')
</if> </if>
<if test="nameCode != '' and nameCode != null"> <if test="nameCode != '' and nameCode != null">
AND nameCode LIKE concat(#{nameCode},'%') AND nameCode LIKE concat(#{nameCode}, '%')
</if> </if>
<if test="isDisable == false"> <if test="isDisable == false">
AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false ) AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
</if> </if>
<if test="unionCode != '' and unionCode != null"> <if test="unionCode != '' and unionCode != null">
and ( and (
nameCode LIKE concat('%',#{unionCode},'%') nameCode LIKE concat('%', #{unionCode}, '%')
or basic_udirel.ybbm LIKE concat('%',#{unionCode},'%') or basic_udirel.ybbm LIKE concat('%', #{unionCode}, '%')
or basic_udirel.sptm LIKE concat('%',#{unionCode},'%')) or basic_udirel.sptm LIKE concat('%', #{unionCode}, '%'))
</if> </if>
<if test="thrPiId != '' and thrPiId != null"> <if test="thrPiId != '' and thrPiId != null">
and ( thirdId LIKE concat('%',#{thrPiId},'%') and (thirdId LIKE concat('%', #{thrPiId}, '%')
or thirdId1 LIKE concat('%',#{thrPiId},'%') or thirdId1 LIKE concat('%', #{thrPiId}, '%')
or thirdId2 LIKE concat('%',#{thrPiId},'%') or thirdId2 LIKE concat('%', #{thrPiId}, '%')
or thirdId3 LIKE concat('%',#{thrPiId},'%') or thirdId3 LIKE concat('%', #{thrPiId}, '%')
or thirdId4 LIKE concat('%',#{thrPiId},'%')) or thirdId4 LIKE concat('%', #{thrPiId}, '%'))
</if> </if>
<if test="uuid != '' and uuid != null"> <if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid} AND basic_udirel.uuid = #{uuid}
@ -261,33 +398,38 @@
AND udplatCode = #{udplatCode} AND udplatCode = #{udplatCode}
</if> </if>
<if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null"> <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh},'%') AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
</if> </if>
<if test="diType != '' and diType != null"> <if test="diType != '' and diType != null">
AND diType =#{diType} AND diType = #{diType}
</if> </if>
<if test="filterType != null and filterType == 1"> <if test="filterType != null and filterType == 1">
AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '' ) thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
and basic_products.originUuid <![CDATA[<>]]> '' and basic_products.originUuid <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 2"> <if test="filterType != null and filterType == 2">
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 +445,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 +452,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 +464,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 +509,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 +536,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}
@ -404,10 +550,10 @@
</select> </select>
<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,8 +576,10 @@
<if test="mainId != '' and mainId != null"> <if test="mainId != '' and mainId != null">
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
@ -440,85 +588,79 @@
<insert id="insertUdiRelevance" keyProperty="id" parameterType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity"> <insert id="insertUdiRelevance" keyProperty="id" parameterType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity">
replace replace
INTO basic_udirel INTO basic_udirel
(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,
,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price ybbm, sptm, isDisable, isLock
) , mainId, mainName, lockStatus, udplatCode, isAdavence, supName, price)
values values (#{id},
( #{thirdId},
#{id}, #{thirdName},
#{thirdId}, #{uuid},
#{thirdName}, #{isUseDy},
#{uuid}, #{updateTime},
#{isUseDy}, #{modifyTime},
#{updateTime}, #{thirdId1},
#{modifyTime}, #{thirdId2},
#{thirdId1}, #{thirdId3},
#{thirdId2}, #{thirdId4},
#{thirdId3}, #{thirdName1},
#{thirdId4}, #{thirdName2},
#{thirdName1}, #{thirdName3},
#{thirdName2}, #{thirdName4},
#{thirdName3}, #{manufactory},
#{thirdName4}, #{measname},
#{manufactory}, #{ybbm},
#{measname}, #{sptm},
#{ybbm}, #{isDisable},
#{sptm}, #{isLock},
#{isDisable}, #{mainId},
#{isLock}, #{mainName},
#{mainId}, #{lockStatus},
#{mainName}, #{udplatCode},
#{lockStatus}, #{isAdavence},
#{udplatCode}, #{supName}, #{price})
#{isAdavence},
#{supName},#{price}
)
</insert> </insert>
<insert id="insertUdiRelevanceignore" keyProperty="id" <insert id="insertUdiRelevanceignore" keyProperty="id"
parameterType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity"> parameterType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity">
insert insert
ignore ignore
INTO basic_udirel INTO basic_udirel
(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,
,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price,modifyTime ybbm, sptm, isDisable, isLock
) , mainId, mainName, lockStatus, udplatCode, isAdavence, supName, price, modifyTime)
values values (#{id},
( #{thirdId},
#{id}, #{thirdName},
#{thirdId}, #{uuid},
#{thirdName}, #{isUseDy},
#{uuid}, #{updateTime},
#{isUseDy}, #{modifyTime},
#{updateTime}, #{thirdId1},
#{modifyTime}, #{thirdId2},
#{thirdId1}, #{thirdId3},
#{thirdId2}, #{thirdId4},
#{thirdId3}, #{thirdName1},
#{thirdId4}, #{thirdName2},
#{thirdName1}, #{thirdName3},
#{thirdName2}, #{thirdName4},
#{thirdName3}, #{manufactory},
#{thirdName4}, #{measname},
#{manufactory}, #{ybbm},
#{measname}, #{sptm},
#{ybbm}, #{isDisable},
#{sptm}, #{isLock},
#{isDisable}, #{mainId},
#{isLock}, #{mainName},
#{mainId}, #{lockStatus},
#{mainName}, #{udplatCode},
#{lockStatus}, #{isAdavence},
#{udplatCode}, #{supName},
#{isAdavence}, #{price}, #{modifyTime})
#{supName},
#{price},#{modifyTime}
)
</insert> </insert>
<delete id="deleteById" parameterType="Map"> <delete id="deleteById" parameterType="Map">
@ -527,7 +669,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 +684,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,34 +785,41 @@
</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, thirdId3, replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, modifyTime, thirdId1, thirdId2,
thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, ybbm, sptm, manufactory, thirdId3,
measname, isDisable, mainId, mainName, udplatCode,supName,price,modifyTime) thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, ybbm, sptm, manufactory,
measname, isDisable, mainId, mainName, udplatCode, supName, price, modifyTime)
values values
<foreach collection="udiRelevanceEntities" item="item" index="index" separator=","> <foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
(#{item.id}, (#{item.id},
#{item.thirdId}, #{item.thirdId},
#{item.thirdName}, #{item.thirdName},
#{item.uuid}, #{item.uuid},
#{item.isUseDy}, #{item.isUseDy},
#{item.updateTime}, #{item.updateTime},
#{item.modifyTime}, #{item.modifyTime},
#{item.thirdId1}, #{item.thirdId1},
#{item.thirdId2}, #{item.thirdId2},
#{item.thirdId3}, #{item.thirdId3},
#{item.thirdId4}, #{item.thirdId4},
#{item.thirdName1}, #{item.thirdName1},
#{item.thirdName2}, #{item.thirdName2},
#{item.thirdName3}, #{item.thirdName3},
#{item.thirdName4}, #{item.thirdName4},
#{item.ybbm}, #{item.ybbm},
#{item.sptm}, #{item.sptm},
#{item.manufactory}, #{item.manufactory},
#{item.measname}, #{item.measname},
#{item.isDisable}, #{item.isDisable},
#{item.mainId}, #{item.mainId},
#{item.mainName}, #{item.mainName},
#{item.udplatCode},#{item.supName},#{item.price},#{modifyTime}) #{item.udplatCode}, #{item.supName}, #{item.price}, #{modifyTime})
</foreach> </foreach>
</insert> </insert>
<select id="selectProductId" resultType="java.lang.String">
select id
from basic_udirel
where uuid = (select uuid from basic_products where nameCode = #{nameCode})
</select>
</mapper> </mapper>

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

@ -329,4 +329,19 @@
</if> </if>
</where> </where>
</select> </select>
<update id="updateByOrderId">
update inv_count_order
set invStorageCode = #{invStorageCode,jdbcType=VARCHAR},
invWarehouseCode = #{invWarehouseCode,jdbcType=VARCHAR},
invSpaceCode = #{invSpaceCode,jdbcType=VARCHAR},
`createUser` = #{createUser,jdbcType=VARCHAR},
createTime = #{createTime,jdbcType=TIMESTAMP},
updateTime = #{updateTime,jdbcType=TIMESTAMP},
auditUser = #{auditUser,jdbcType=VARCHAR},
auditTime = #{auditTime,jdbcType=TIMESTAMP},
`status` = #{status,jdbcType=BOOLEAN},
remark = #{remark,jdbcType=VARCHAR}
where orderId = #{orderId}
</update>
</mapper> </mapper>

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

@ -301,4 +301,18 @@
from inv_count_order_detail od from inv_count_order_detail od
left join basic_products p on od.productId = p.id left join basic_products p on od.productId = p.id
</select> </select>
<select id="selectByOrderIdAndProductId" resultMap="BaseResultMap">
select *
from inv_count_order_detail
where orderIdFk = #{orderIdFk}
and productId = #{productId}
</select>
<delete id="deleteByOrderIdAndProductId">
delete
from inv_count_codes
where orderIdFk = #{orderIdFk}
and productId = #{productId}
</delete>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save