diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java index 7e0fd0881..ce60c53b3 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java @@ -16,9 +16,13 @@ import com.glxp.api.req.collect.CollectOrderUploadCountRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UserWorkResponse; import com.glxp.api.res.collect.CollectOrderBizResponse; +import com.glxp.api.res.collect.CollectOrderUploadCountResponse; import com.glxp.api.res.collect.IoCollectOrderResponse; import com.glxp.api.service.basic.BasicCollectUserService; import com.glxp.api.service.collect.IoCollectOrderBackupService; +import com.glxp.api.service.collect.IoCollectOrderBizBackupService; +import com.glxp.api.service.collect.IoCollectOrderService; +import io.swagger.models.auth.In; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -39,11 +43,13 @@ import java.util.stream.Collectors; public class IoCollectOrderBackupController extends BaseController { @Resource - IoCollectOrderBackupService ioCollectOrderBackupService; + private IoCollectOrderBackupService ioCollectOrderBackupService; @Resource private BasicCollectUserService basicCollectUserService; + @Resource + private IoCollectOrderBizBackupService ioCollectOrderBizBackupService; @PostMapping("/udiwms/basic/collect/orderFinish/filter") public BaseResponse filterOrder(@RequestBody CollectOrderRequest collectOrderRequest) { @@ -83,6 +89,11 @@ public class IoCollectOrderBackupController extends BaseController { return ResultVOUtils.error(500, "未找到单据"); } List collectOrderBizResponses = ioCollectOrderBackupService.combieOrderDetail(collectOrderBizRequest); + for (CollectOrderBizResponse response : collectOrderBizResponses){ + if (response.getGgxh() == null){ + response.setGgxh(response.getSpec()); + } + } PageInfo pageInfo = new PageInfo<>(collectOrderBizResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); @@ -131,15 +142,42 @@ public class IoCollectOrderBackupController extends BaseController { */ @PostMapping ("/udiwms/basic/collect/orderFinish/uploadCount") public BaseResponse uploadCount(@RequestBody CollectOrderUploadCountRequest collectOrderUploadCountRequest) { + CollectOrderUploadCountResponse collectOrderUploadCountResponse = new CollectOrderUploadCountResponse(); + if(collectOrderUploadCountRequest.getStartTime()!=null + && collectOrderUploadCountRequest.getEndTime() !=null){ + collectOrderUploadCountRequest.setStartTime(collectOrderUploadCountRequest.getStartTime()+" 00:00:00"); + collectOrderUploadCountRequest.setEndTime(collectOrderUploadCountRequest.getEndTime()+" 23:59:59"); - List> map = ioCollectOrderBackupService.listMaps(new QueryWrapper() + } + List> list = ioCollectOrderBackupService.listMaps(new QueryWrapper() .groupBy("uploadStatus") .between(collectOrderUploadCountRequest.getStartTime()!=null && collectOrderUploadCountRequest.getEndTime() !=null - ,"updateTime",collectOrderUploadCountRequest.getStartTime()+" 00:00:00",collectOrderUploadCountRequest.getEndTime()+" 23:59:59") + ,"updateTime",collectOrderUploadCountRequest.getStartTime(),collectOrderUploadCountRequest.getEndTime()) .select("uploadStatus","count(1) as count") ); - return ResultVOUtils.success(map); + Long notUploadingCount=0L; + Long alreadyUploadingCount=0L; + Long uploadingFailCount=0L; + if(list!=null && list.size() >0){ + for (Map stringObjectMap : list) { + if(1 == (Integer)stringObjectMap.get("uploadStatus")){ + notUploadingCount += (Long) stringObjectMap.get("count"); + }else if(2 == (Integer)stringObjectMap.get("uploadStatus")){ + alreadyUploadingCount += (Long)stringObjectMap.get("count"); + }else if(3 == (Integer)stringObjectMap.get("uploadStatus")){ + uploadingFailCount += (Long)stringObjectMap.get("count"); + } + } + } + + + collectOrderUploadCountResponse.setNotUploadingCount(notUploadingCount); + collectOrderUploadCountResponse.setAlreadyUploadingCount(alreadyUploadingCount); + collectOrderUploadCountResponse.setUploadingFailCount(uploadingFailCount); + // 总上传码数量 获取采购上传率 销售上传率 计算 + ioCollectOrderBizBackupService.CalculatedUploadRate( collectOrderUploadCountRequest,collectOrderUploadCountResponse); + return ResultVOUtils.success(collectOrderUploadCountResponse); } } diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index e5d896478..49454c754 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -129,6 +129,7 @@ public class IoCodeTempController extends BaseController { @Resource IoCollectOrderBackupService ioCollectOrderBackupService; + /** * PDA-----单据上传 */ @@ -1584,6 +1585,12 @@ public class IoCodeTempController extends BaseController { if (relCodeDetail != null) { codeEnttity.setGrantPaCode(relCodeDetail.getParentCode()); } +// if (StrUtil.isEmpty(codeEnttity.getBatchNo())) { + //当关联关系存在的时候 以关联关系的批次号为准 + codeEnttity.setBatchNo(codeRelEntity.getBatchNo()); + codeEnttity.setExpireDate(codeRelEntity.getMadeDate() + ""); + codeEnttity.setExpireDate(codeRelEntity.getValidateDate() + ""); +// } } String unitFk = null; @@ -1677,7 +1684,6 @@ public class IoCodeTempController extends BaseController { orderService.insertOrder(orderEntity); } - //todo 不关联查了直接查queue表 if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) { // 判断货位里面是否有相同产品 if (orderEntity != null && StrUtil.isNotEmpty(orderEntity.getWorkPlaceQueueCode())) { @@ -2837,14 +2843,34 @@ public class IoCodeTempController extends BaseController { } }); - addOrderCodeRequest.setCodeList(codeList); + List codeOnelist = new ArrayList(); + // 检查该码的所有一级码并且加入进去 + for (String code : codeList) { + List list = relCodeDetailService.getAllNextOne(code); + if(list!=null && list.size() >0){ + for (RelCodeDetail relCodeDetail : list) { + codeOnelist.add(relCodeDetail.getCurCode()); + } + }else { + codeOnelist.add(code); + } + } + + addOrderCodeRequest.setCodeList(codeOnelist); addOrderCodeRequest.setCorpOrderId(orderFinishBillNo); + CollectOrderBizResponse response = collectOrderBizResponses.get(0); + //TODO 这里是获取已完成订单的 批次号 + if (response.getBatchNo() != null){ + addOrderCodeRequest.setBatchNo(response.getBatchNo()); + addOrderCodeRequest.setProduceDate(response.getProductDate()); + addOrderCodeRequest.setExpireDate(response.getExpireDate()); + } AddCodeResult addCodeResult = new AddCodeResult(); - if (CollUtil.isEmpty(codeList)) + if (CollUtil.isEmpty(codeOnelist)) return ResultVOUtils.error(500, "追溯码不能为空"); List vailCodeResultResponses = new ArrayList<>(); - for (String code : codeList) { + for (String code : codeOnelist) { VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse(); AddOrderRequest addOrderRequest = new AddOrderRequest(); BeanUtils.copyProperties(addOrderCodeRequest, addOrderRequest); diff --git a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBackupMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBackupMapper.java index f207b6946..6711851fd 100644 --- a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBackupMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBackupMapper.java @@ -14,4 +14,5 @@ import java.util.List; public interface IoCollectOrderBackupMapper extends BaseMapper { List filterList(CollectOrderRequest collectOrderRequest); + } diff --git a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizBackupMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizBackupMapper.java index e41f7af83..847969628 100644 --- a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizBackupMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderBizBackupMapper.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.collect.IoCollectOrderBizBackup; import com.glxp.api.req.collect.CollectOrderBizRequest; +import com.glxp.api.req.collect.CollectOrderUploadCountRequest; import com.glxp.api.res.collect.CollectOrderBizResponse; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -14,4 +16,7 @@ import java.util.List; public interface IoCollectOrderBizBackupMapper extends BaseMapper { List filterList(CollectOrderBizRequest collectOrderRequest); + + List getList(CollectOrderUploadCountRequest collectOrderUploadCountRequest); + } diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index f83c3042e..f840131ed 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -21,6 +21,7 @@ import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.res.thrsys.ThrProductsResponse; import com.glxp.api.res.thrsys.UdiwmsWarehouseDetail; import com.glxp.api.service.thrsys.ThrSystemService; +import com.glxp.api.util.OkHttpCli; import lombok.extern.slf4j.Slf4j; import okhttp3.*; import org.apache.commons.lang3.exception.ExceptionUtils; @@ -28,8 +29,8 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * 第三方服务HttpClient @@ -44,6 +45,8 @@ public class ErpBasicClient { HttpOkClient httpOkClient; @Resource private ThrSystemService basicThirdSysService; + @Resource + private OkHttpCli okHttpCli; /** * 获取往来单位 @@ -497,4 +500,23 @@ public class ErpBasicClient { return ResultVOUtils.error(500, "连接第三方系统接口服务出错"); } } + + public BaseResponse> getBuyType(String thirdSys) { + ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(thirdSys); + String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getBuyType"; + try { + String response = okHttpCli.doGet(url); + if (StrUtil.isEmpty(response)) { + return ResultVOUtils.error(500, "连接第三方系统接口服务出错"); + } + BaseResponse> listBaseResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + + return listBaseResponse; + } catch (Exception e) { + log.error("获取交易类型集合", e); + return ResultVOUtils.error(500, "连接第三方系统接口服务出错"+e.getMessage()); + } + } } diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index d8cef8cb9..ec97ae8e7 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -125,6 +125,7 @@ public class FilterUdiRelRequest extends ListPageRequest { private String payFeeCode; private String keyWords; + private List filterNameCodes; } diff --git a/src/main/java/com/glxp/api/req/inout/AddOrderCodeRequest.java b/src/main/java/com/glxp/api/req/inout/AddOrderCodeRequest.java index 21abb033b..640a93f65 100644 --- a/src/main/java/com/glxp/api/req/inout/AddOrderCodeRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddOrderCodeRequest.java @@ -51,4 +51,9 @@ public class AddOrderCodeRequest { private String workPlaceQueueCode; private String orderFinishBillNo; + private String batchNo; + private String produceDate; + private String expireDate; + private String serialNo; + } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java index d669851ed..b86974772 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java @@ -65,6 +65,9 @@ public class FilterOrderDetailResultRequest extends ListPageRequest { private String confirmEndTime; //发票确认结束日期 private String corpName;//供应商名字 + private String prepnSpec; + + private Boolean groupBuy; //是否集采产品 diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvPreProductRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvPreProductRequest.java index a1214ac9f..3817162fb 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvPreProductRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterInvPreProductRequest.java @@ -111,4 +111,6 @@ public class FilterInvPreProductRequest extends ListPageRequest { private String diCode; private Integer filterNoInv; + + private String keyWords; } diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvPreinProductRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvPreinProductRequest.java index 8a25e6b6a..85cb5dde9 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvPreinProductRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterInvPreinProductRequest.java @@ -117,4 +117,6 @@ public class FilterInvPreinProductRequest extends ListPageRequest { private Integer filterNoInv; + private String keyWords; + } diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java index 9104b0cf6..69f8f591a 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java @@ -147,4 +147,8 @@ public class FilterInvProductRequest extends ListPageRequest { */ private Integer productsType = 1;//默认是耗材 + private String keyWords; + private String bzgg; + private String prepnSpec; + } diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java index fcc9ea5df..58a56a426 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java @@ -163,6 +163,9 @@ public class CollectOrderBizResponse { private String workplaceQueueCode; private String spec; + + private String busType; + private Integer uploadStatus; // /** // * 未赋码数量 // */ diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderUploadCountResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderUploadCountResponse.java new file mode 100644 index 000000000..3392b8bce --- /dev/null +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderUploadCountResponse.java @@ -0,0 +1,22 @@ +package com.glxp.api.res.collect; + +import io.swagger.models.auth.In; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 单据上传统计返回 + * qyt + */ +@Data +public class CollectOrderUploadCountResponse { + private Long notUploadingCount; + private Long alreadyUploadingCount; + private Long uploadingFailCount; + + private BigDecimal buyerCentage; + private BigDecimal salesCentage; + private Integer codeCount; + +} diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java index 6024d48c5..20c56e8e1 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java @@ -233,6 +233,8 @@ public class IoOrderDetailResultResponse { //生产企业 private String manufactory; + private String zczbhhzbapzbh; + public String getFromName() { if (StrUtil.isNotEmpty(fromCorpName)) diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java index 303bbdd48..137d8c101 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -393,4 +393,7 @@ public class IoCollectOrderBackupService extends ServiceImpl filterList(CollectOrderBizRequest collectOrderRequest) { if (collectOrderRequest == null) { @@ -32,4 +39,79 @@ public class IoCollectOrderBizBackupService extends ServiceImpl data = ioCollectOrderBizBackupMapper.filterList(collectOrderRequest); return data; } + + /** + * 计算上传率 + */ + public void CalculatedUploadRate(CollectOrderUploadCountRequest collectOrderUploadCountRequest, CollectOrderUploadCountResponse collectOrderUploadCountResponse) { + List list = ioCollectOrderBizBackupMapper.getList(collectOrderUploadCountRequest); + Map buyTypeMap = new HashMap<>(); + List buyTypeBuyer = new ArrayList<>(); + List buyTypeSales = new ArrayList<>(); + Integer buyerCount = 0; + Integer salesCount = 0; + Integer buyerScanCount = 0; + Integer salesScanCount = 0; + BigDecimal buyerCentage = new BigDecimal(0); + BigDecimal salesCentage = new BigDecimal(0); + Integer codeCount = 0; + if (list != null && list.size() > 0) { + BaseResponse> baseResponse = erpBasicClient.getBuyType("thirdId"); + if (baseResponse.getCode() == 20000) { + buyTypeMap = baseResponse.getData(); + buyTypeBuyer = new ArrayList<>(Arrays.asList(buyTypeMap.get("buyType_3501"))); + buyTypeBuyer.addAll(Arrays.asList(buyTypeMap.get("buyType_3502"))); + + buyTypeSales = new ArrayList<>(Arrays.asList(buyTypeMap.get("buyType_3505"))); + buyTypeSales.addAll(Arrays.asList(buyTypeMap.get("buyType_3506"))); + } + + for (CollectOrderBizResponse collectOrderBizResponse : list) { + for (String buyType : buyTypeBuyer) { + if (buyType.equals(collectOrderBizResponse.getBusType())) { + buyerCount += collectOrderBizResponse.getCount(); + // 只有已上传的码才是正确的码 + if (2 == collectOrderBizResponse.getUploadStatus()) { + buyerScanCount += collectOrderBizResponse.getScanCount(); + } + } + } + for (String buyType : buyTypeSales) { + if (buyType.equals(collectOrderBizResponse.getBusType())) { + salesCount += collectOrderBizResponse.getCount(); + if (2 == collectOrderBizResponse.getUploadStatus()) { + salesScanCount += collectOrderBizResponse.getScanCount(); + } + } + } + } + + // 计算采购率和销售率 + + BigDecimal buyerCountBigDecimal = BigDecimal.valueOf(buyerCount); + BigDecimal buyerScanCountBigDecimal = BigDecimal.valueOf(buyerScanCount); + if(buyerCountBigDecimal.equals(new BigDecimal(0))){ + buyerCentage = new BigDecimal(0).setScale(2, BigDecimal.ROUND_HALF_UP); + }else { + buyerCentage = buyerScanCountBigDecimal.divide(buyerCountBigDecimal,4, BigDecimal.ROUND_HALF_UP ).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP); + } + + BigDecimal salesCountBigDecimal = BigDecimal.valueOf(salesCount); + BigDecimal salesScanCountBigDecimal = BigDecimal.valueOf(salesScanCount); + if(salesCountBigDecimal.equals(new BigDecimal(0))){ + salesCentage = new BigDecimal(0).setScale(2, BigDecimal.ROUND_HALF_UP); + }else { + salesCentage = salesScanCountBigDecimal.divide(salesCountBigDecimal,4, BigDecimal.ROUND_HALF_UP ).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP); + } + codeCount = buyerScanCount + salesScanCount; + } + collectOrderUploadCountResponse.setBuyerCentage(buyerCentage); + collectOrderUploadCountResponse.setSalesCentage(salesCentage); + collectOrderUploadCountResponse.setCodeCount(codeCount); + } + + public static void main(String[] args) { + System.out.println(new BigDecimal(0).setScale(2, BigDecimal.ROUND_HALF_UP)); + } + } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index d1722f4ea..da2cf55e1 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -153,7 +153,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl IntUtil.value(udiRelevanceResponse.getUseMaxLevel())) { + if (udiRelevanceResponse.getUseMaxLevel() != null && IntUtil.value(udiRelevanceResponse.getPackLevel()) > IntUtil.value(udiRelevanceResponse.getUseMaxLevel())) { throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！"); } if (udiRelevanceResponse.getUseMaxLevel() == null && IntUtil.value(udiRelevanceResponse.getPackLevel()) > 1) { @@ -464,10 +464,10 @@ public class IoCollectOrderCodeManService extends ServiceImpl list) { + List relCodeDetails = this.baseMapper.selectList( + new LambdaQueryWrapper().eq(RelCodeDetail::getParentCode, code)); + + if (CollUtil.isNotEmpty(relCodeDetails)) { + Integer packLayer = relCodeDetails.get(0).getPackLayer(); + if(packLayer == 1){ + list.addAll(relCodeDetails); + } + for (RelCodeDetail relCodeDetail : relCodeDetails) { + fetchAllChildrenOne(relCodeDetail.getCurCode(), list); + } + } + } + /** + * 获取下级所有一级码 + * + * @return + */ + public List getAllNextOne(String code) { + List list = new ArrayList<>(); + fetchAllChildrenOne(code, list); + return list; + } } diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index eecc47623..bf42f71d0 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -750,6 +750,13 @@ or basic_products.bzgg LIKE concat('%', #{keyWords}, '%') or basic_products.prepnSpec LIKE concat('%', #{keyWords}, '%')) + + and nameCode not in + + #{item} + + and basic_products.packLevel = 1 + GROUP BY basic_udirel.id ORDER BY modifyTime DESC diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml index 757908851..9089dac07 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml @@ -140,4 +140,5 @@ GROUP BY icob.billNo order by case when icob.orderTime is null then icob.createTime else icob.orderTime end desc + diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml index 7eb5ae7a5..5a2266a37 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml @@ -36,4 +36,13 @@ group by icobb.id + diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index c602c86af..06780de7a 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -31,6 +31,9 @@ a1.auditTime, bu.isStack, bu.groupBuy, + bp.prepnSpec, + COALESCE(bp.ylqxzcrbarmc,bp.manufactory) as manufactory, + bp.zczbhhzbapzbh, GROUP_CONCAT(ioi.invoiceEncode ORDER BY ioi.invoiceEncode SEPARATOR ',') AS invoiceCodes, b1.NAME AS fromCorpName, basic_bussiness_type.name billTypeName @@ -38,6 +41,7 @@ LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp LEFT JOIN basic_udirel bu ON a2.bindRlFk = bu.id + inner JOIN basic_products bp ON bp.uuid = bu.uuid left join basic_bussiness_type on a1.action = basic_bussiness_type.action LEFT JOIN io_order_invoice ioi ON a1.billNo = ioi.orderIdFk left join auth_warehouse aw on aw.code = a1.fromInvCode @@ -52,9 +56,9 @@ AND a1.productType = #{productType} - - AND (aw.name like concat('%', #{keyWords}, '%') or b1.name like concat('%', #{keyWords}, '%')) - + + + AND a2.nameCode = #{nameCode} @@ -109,12 +113,30 @@ AND a2.coName like concat('%', #{productName}, '%') + + AND bp.prepnSpec like concat('%', #{prepnSpec}, '%') + AND a1.`action` in #{item} + + AND ( + a2.nameCode LIKE concat('%', #{keyWords}, '%') + or a2.coName like concat('%', #{keyWords}, '%') + or a2.orderIdFk LIKE concat('%', #{keyWords}, '%') + or a2.spec LIKE concat('%', #{keyWords}, '%') + or bp.prepnSpec LIKE concat('%', #{keyWords}, '%') + or a2.batchNo like concat('%', #{keyWords}, '%') + or bp.zczbhhzbapzbh LIKE concat('%', #{keyWords}, '%') + or bp.manufactory LIKE concat('%', #{keyWords}, '%') + or bp.ylqxzcrbarywmc LIKE concat('%', #{keyWords}, '%') + or b1.name like concat('%', #{keyWords}, '%') + or aw.name like concat('%', #{keyWords}, '%')) + + group by a2.id diff --git a/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml index a9298f6fd..d5935cb10 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml @@ -85,6 +85,16 @@ #{item} + + AND ( + bp.cpmctymc like concat('%', #{keyWords}, '%') + or ipp.nameCode like concat('%', #{keyWords}, '%') + or bp.ggxh like concat('%', #{keyWords}, '%') + or ipp.batchNo like concat('%', #{keyWords}, '%') + or bp.zczbhhzbapzbh like concat('%', #{keyWords}, '%') + or bp.ylqxzcrbarmc like concat('%', #{keyWords}, '%') + ) + group by ipp.id @@ -305,6 +315,16 @@ #{item} + + AND ( + bp.cpmctymc like concat('%', #{keyWords}, '%') + or ipp.nameCode like concat('%', #{keyWords}, '%') + or bp.ggxh like concat('%', #{keyWords}, '%') + or ipp.batchNo like concat('%', #{keyWords}, '%') + or bp.zczbhhzbapzbh like concat('%', #{keyWords}, '%') + or bp.ylqxzcrbarmc like concat('%', #{keyWords}, '%') + ) + GROUP BY ipp.relId, ipp.batchNo order by ipp.updateTime desc diff --git a/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml index 9b687383b..79a5bba9b 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml @@ -85,6 +85,16 @@ #{item} + + AND ( + bp.cpmctymc like concat('%', #{keyWords}, '%') + or ipp.nameCode like concat('%', #{keyWords}, '%') + or bp.ggxh like concat('%', #{keyWords}, '%') + or ipp.batchNo like concat('%', #{keyWords}, '%') + or bp.zczbhhzbapzbh like concat('%', #{keyWords}, '%') + or bp.ylqxzcrbarmc like concat('%', #{keyWords}, '%') + ) + group by ipp.id @@ -305,6 +315,16 @@ #{item} + + AND ( + bp.cpmctymc like concat('%', #{keyWords}, '%') + or ipp.nameCode like concat('%', #{keyWords}, '%') + or bp.ggxh like concat('%', #{keyWords}, '%') + or ipp.batchNo like concat('%', #{keyWords}, '%') + or bp.zczbhhzbapzbh like concat('%', #{keyWords}, '%') + or bp.ylqxzcrbarmc like concat('%', #{keyWords}, '%') + ) + GROUP BY ipp.relId, ipp.batchNo order by ipp.updateTime desc diff --git a/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml b/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml index 5c086ab1c..4fe5b0a03 100644 --- a/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml @@ -65,6 +65,12 @@ AND bp.ggxh like concat('%', #{ggxh}, '%') + + AND bp.bzgg like concat('%', #{bzgg}, '%') + + + AND bp.prepnSpec like concat('%', #{prepnSpec}, '%') + AND ipp.batchNo like concat('%', #{batchNo}, '%') @@ -75,7 +81,10 @@ AND ipp.expireDate = #{expireDate} - AND bp.ylqxzcrbarmc like concat('%', #{ylqxzcrbarmc}, '%') + AND ( + bp.ylqxzcrbarmc like concat('%', #{ylqxzcrbarmc}, '%') + or bp.manufactory like concat('%', #{ylqxzcrbarmc}, '%') + ) AND bp.zczbhhzbapzbh like concat('%', #{zczbhhzbapzbh}, '%') @@ -99,6 +108,18 @@ #{item} + + AND ( + bp.cpmctymc like concat('%', #{keyWords}, '%') + or ipp.nameCode like concat('%', #{keyWords}, '%') + or bp.ggxh like concat('%', #{keyWords}, '%') + or bp.bzgg like concat('%', #{keyWords}, '%') + or bp.prepnSpec LIKE concat('%', #{keyWords}, '%') + or ipp.batchNo like concat('%', #{keyWords}, '%') + or bp.zczbhhzbapzbh LIKE concat('%', #{keyWords}, '%') + or bp.manufactory LIKE concat('%', #{keyWords}, '%') + or bp.ylqxzcrbarywmc LIKE concat('%', #{keyWords}, '%')) + GROUP BY ipp.relIdFk, ipp.batchNo order by ipp.updateTime desc diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml index d151e55fd..cf4c7cf1c 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml @@ -85,7 +85,10 @@ AND ip.expireDate = #{expireDate} - AND bp.ylqxzcrbarmc like concat('%', #{ylqxzcrbarmc}, '%') + AND ( + bp.ylqxzcrbarmc like concat('%', #{ylqxzcrbarmc}, '%') + or bp.manufactory like concat('%', #{ylqxzcrbarmc}, '%') + ) AND bp.zczbhhzbapzbh like concat('%', #{zczbhhzbapzbh}, '%') @@ -124,12 +127,30 @@ AND basic_udirel.attributeType = #{attributeType} + + AND bp.bzgg like concat('%', #{bzgg}, '%') + + + AND bp.prepnSpec like concat('%', #{prepnSpec}, '%') + AND ip.invCode in #{item} + + AND ( + bp.cpmctymc like concat('%', #{keyWords}, '%') + or ip.nameCode like concat('%', #{keyWords}, '%') + or bp.ggxh like concat('%', #{keyWords}, '%') + or bp.bzgg like concat('%', #{keyWords}, '%') + or bp.prepnSpec LIKE concat('%', #{keyWords}, '%') + or ip.batchNo like concat('%', #{keyWords}, '%') + or bp.zczbhhzbapzbh LIKE concat('%', #{keyWords}, '%') + or bp.manufactory LIKE concat('%', #{keyWords}, '%') + or bp.ylqxzcrbarywmc LIKE concat('%', #{keyWords}, '%')) + GROUP BY ip.relIdFk, ip.batchNo, ip.supId, ip.price order by ip.updateTime desc