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..97a9637bf 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1677,7 +1677,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())) { 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/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/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index c602c86af..13a73d147 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,29 @@ 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