From 0664fb05dd543082af070321090d4c9157dd83aa Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 25 Jun 2025 13:08:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?demand:=20=20=E7=BB=84=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E3=80=81=E6=89=B9=E9=87=8F=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/mapper/EmisTransPlanRuleMapper.java   |  7 +++++++
 .../impl/EmisTmsSiteBatchServiceImpl.java      | 18 ++++++++++++++++++
 .../mapper/EmisTransPlanRuleMapper.xml         | 17 +++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransPlanRuleMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransPlanRuleMapper.java
index 004cd7f9c..2194c4b64 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransPlanRuleMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransPlanRuleMapper.java
@@ -166,4 +166,11 @@ public interface EmisTransPlanRuleMapper {
      * @return 总数
      */
     int countForAllScan(EmisTransPlanRule emisTransPlanRule);
+
+    /**
+     *
+     * @param emisTransPlanRule
+     * @return
+     */
+    List<EmisTransPlanRule> checkTransPlanRule(EmisTransPlanRule emisTransPlanRule);
 }
\ No newline at end of file
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
index ceb714dc5..042bfeab9 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
@@ -23,6 +23,7 @@ import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.mapper.EmisTmsSiteBatchDtlMapper;
 import com.xdadan.erp.emis.mapper.EmisTmsSiteBatchLoadingMapper;
+import com.xdadan.erp.emis.mapper.EmisTransPlanRuleMapper;
 import com.xdadan.erp.emis.service.EmisBaseService;
 import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -57,6 +58,9 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi
     @Autowired
     RedissonService redissonService;
 
+    @Autowired
+    private EmisTransPlanRuleMapper emisTransPlanRuleMapper;
+
     /**
      * 查询一级网点TMS组批次
      * 
@@ -133,9 +137,23 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi
         if (Objects.nonNull(emisWaybill) && StringUtil.isNotBlank(emisWaybill.getVirtualRemark())) {
             throw new EmisBizError(EmisBizErrorType.FAIL, billCode + "已绑定虚拟单，无法录入批次");
         }
+        checkTransPlanRule(oldSiteBatch, emisWaybill);
         checkUnique(oldSiteBatch, billCode);
     }
 
+    private void checkTransPlanRule(EmisTmsSiteBatch oldSiteBatch, EmisWaybill emisWaybill) throws EmisBizError {
+        EmisTransPlanRule emisTransPlanRule = new EmisTransPlanRule();
+        emisTransPlanRule.setStartSiteCode(oldSiteBatch.getStartSiteCode());
+        emisTransPlanRule.setNextSiteCode(oldSiteBatch.getNextSiteCode());
+        emisTransPlanRule.setSupplierCode(oldSiteBatch.getSupplierCode());
+        emisTransPlanRule.setLineCode(emisWaybill.getTransLineType());
+        emisTransPlanRule.setProductType(emisWaybill.getProductType());
+        List<EmisTransPlanRule> list = emisTransPlanRuleMapper.checkTransPlanRule(emisTransPlanRule);
+        if (CollectionUtil.isEmpty(list)) {
+            throw new EmisBizError(EmisBizErrorType.FAIL, "组批次起始网点、下一网点、供应商与规则不匹配");
+        }
+    }
+
     private void checkUnique(EmisTmsSiteBatch oldSiteBatch, String billCode) throws EmisBizError {
         EmisTmsSiteBatch emisTmsSiteBatch = new EmisTmsSiteBatch();
         emisTmsSiteBatch.setStartSiteCode(oldSiteBatch.getStartSiteCode());
diff --git a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
index 334bf7eaa..9aa78faa0 100644
--- a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
@@ -61,6 +61,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by id desc
     </select>
 
+    <select id="checkTransPlanRule" parameterType="EmisTransPlanRule" resultMap="EmisTransPlanRuleResult">
+        select r.*
+        from emis_trans_plan_rule r
+        <where>
+            r.del_flag = '0'
+            <if test="lineCode != null  and lineCode != ''"> and r.line_code = #{lineCode}</if>
+            <if test="productType != null  and productType != ''"> and ( FIND_IN_SET(#{productType},r.product_type) )</if>
+            <if test="startSiteCode != null  and startSiteCode != ''"> and r.start_site_code = #{startSiteCode}</if>
+            <if test="nextSiteCode != null  and nextSiteCode != ''"> and r.next_site_code = #{nextSiteCode}</if>
+            <if test="manager != null  and manager != ''"> and r.manager = #{manager}</if>
+            <if test="supplierCode != null  and supplierCode != ''"> and ( FIND_IN_SET(#{supplierCode},r.supplier_code) )</if>
+            <if test="startDate != null"> and r.start_date = #{startDate}</if>
+            <if test="endDate != null"> and r.end_date = #{endDate}</if>
+        </where>
+        order by id desc
+    </select>
+
     <select id="selectRulesForAllScan" parameterType="EmisTransPlanRule" resultMap="EmisTransPlanRuleResult">
         select r.id, r.line_code, r.product_type, r.start_site_code,r.next_site_code, s1.site_name as start_site_name,
         s2.site_name as next_site_name,

From 7e1fa091bd8d9abce5eb5b48f8472e5d2f1fab8d Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 25 Jun 2025 13:09:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?demand:=20=20=E7=BB=84=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E3=80=81=E6=89=B9=E9=87=8F=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xdadan/erp/web/emis/EmisWaybillController.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index 7006ab32e..5cfb029bf 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -113,7 +113,9 @@ public class EmisWaybillController extends EmisBaseController
      */
     @GetMapping(value = "/getMasterEmisWaybills")
     public TableDataInfo getMasterEmisWaybills(EmisWaybill emisWaybill){
-        startPage();
+//        startPage();
+        // 设置通用权限查询参数
+//        setPrivParams(emisWaybill);
         emisWaybill.getParams().put("privSiteCode", getLoginUser().getUser().getOwnerSiteCode());
         List<EmisWaybill> list = emisWaybillService.selectMasterEmisWaybills(emisWaybill);
         return getDataTable(list);