2025-10-22

固定载具优化

src/main/java/com/gaotao/modules/fixedCarrier/controller/FixedCarrierController.java

@@ -95,11 +95,11 @@ public class FixedCarrierController extends AbstractController {
     public R save(@RequestBody FixedCarrier fixedCarrier) {
         try {
             // 参数校验
-            if (fixedCarrier.getSite() == null || fixedCarrier.getSite().isEmpty()) {
-                return R.error("站点不能为空");
-            }
-            if (fixedCarrier.getBuNo() == null || fixedCarrier.getBuNo().isEmpty()) {
-                return R.error("BU不能为空");
+            if (fixedCarrier.getBu().split("_").length >= 2 ) {
+                fixedCarrier.setSite(fixedCarrier.getBu().split("_")[0]);
+                fixedCarrier.setBuNo(fixedCarrier.getBu().split("_")[1]);
+            } else {
+                return R.error("工厂和部门有误!");
             }
             if (fixedCarrier.getCarrierNo() == null || fixedCarrier.getCarrierNo().isEmpty()) {
                 return R.error("载具编码不能为空");
@@ -137,11 +137,11 @@ public class FixedCarrierController extends AbstractController {
     public R update(@RequestBody FixedCarrier fixedCarrier) {
         try {
             // 参数校验
-            if (fixedCarrier.getSite() == null || fixedCarrier.getSite().isEmpty()) {
-                return R.error("站点不能为空");
-            }
-            if (fixedCarrier.getBuNo() == null || fixedCarrier.getBuNo().isEmpty()) {
-                return R.error("BU不能为空");
+            if (fixedCarrier.getBu().split("_").length >= 2 ) {
+                fixedCarrier.setSite(fixedCarrier.getBu().split("_")[0]);
+                fixedCarrier.setBuNo(fixedCarrier.getBu().split("_")[1]);
+            } else {
+                return R.error("工厂和部门有误!");
             }
             if (fixedCarrier.getCarrierNo() == null || fixedCarrier.getCarrierNo().isEmpty()) {
                 return R.error("载具编码不能为空");

src/main/java/com/gaotao/modules/fixedCarrier/entity/FixedCarrier.java

@@ -11,6 +11,7 @@ import java.util.Date;
  * 对应数据库表：fixed_carrier
  */
 public class FixedCarrier {
+    private String bu;
     /**
      * 站点
      */
@@ -112,6 +113,14 @@ public class FixedCarrier {
      */
     private String remark;
 
+    public String getBu() {
+        return bu;
+    }
+
+    public void setBu(String bu) {
+        this.bu = bu;
+    }
+
     public String getSite() {
         return site;
     }

src/main/resources/mapper/fixedCarrier/FixedCarrierMapper.xml

@@ -49,12 +49,11 @@
             create_date AS createDate,
             remark
         FROM fixed_carrier
-        WHERE 1=1
-        <if test="site != null and site != ''">
-            AND site = #{site}
-        </if>
-        <if test="buNo != null and buNo != ''">
-            AND bu_no = #{buNo}
+        WHERE
+        site in (select site from AccessSite where userID = #{userName})
+        and bu_no in (select bu_no from AccessBu where username = #{userName})
+        <if test="buDesc != null and buDesc != ''">
+            AND dbo.get_bu_desc (site, bu_no) = #{buDesc}
         </if>
         <if test="carrierNo != null and carrierNo != ''">
             AND carrier_no LIKE '%' + #{carrierNo} + '%'
@@ -170,12 +169,11 @@
     <select id="queryTotal" resultType="int">
         SELECT COUNT(*)
         FROM fixed_carrier
-        WHERE 1=1
-        <if test="site != null and site != ''">
-            AND site = #{site}
-        </if>
-        <if test="buNo != null and buNo != ''">
-            AND bu_no = #{buNo}
+        WHERE
+        site in (select site from AccessSite where userID = #{userName})
+        and bu_no in (select bu_no from AccessBu where username = #{userName})
+        <if test="buDesc != null and buDesc != ''">
+            AND dbo.get_bu_desc (site, bu_no) = #{buDesc}
         </if>
         <if test="carrierNo != null and carrierNo != ''">
             AND carrier_no LIKE '%' + #{carrierNo} + '%'