杰生

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockBackMapper.xml

@@ -250,6 +250,8 @@
         from stock_back sb
                  inner join stock_back_details sbd on sb.id = sbd.stock_back_id
                  inner join material m on sbd.material_id = m.ID
+                 left join acc_account ac on ac.AccountNo = sb.operator_id
+                 left join u_user uu on ac.ID = uu.ID
             ${ew.customSqlSegment}
     </select>
 

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.xml

@@ -80,56 +80,56 @@
     </select>
 
     <select id="remainingTodayPage" resultType="java.util.LinkedHashMap">
-        SELECT
-            m.ID materialId,
-            mc.NAME categoryName,
-            m.NAME materialName,
-            m.CODE materialCode,
-            m.Width materialWidth,
-            sum( sd.Quantity ) sum,
-            count( sd.Quantity ) count,
-            sum(
-                    IF
-                        ( datediff( now(), sd.CreatedTime ) > m.DelayPeriod, sd.Quantity, 0 )) retentionQuantity,
-            m.SafetyStock materialSafetyStock,
-            IF
-                (( a.CheckTagCount = a.TagQuantity ) AND ( a.CheckTagCount = a.HandTagCount ), 1, 0 ) inventoryResults,
-            ifnull( a.CheckTagCount - a.TagQuantity, 0 ) correctionQuantity,
-            a.CheckTime checkTime,
-            uu.RealName OperUserName
-        FROM
-            material m
-                LEFT JOIN stock_detail sd ON sd.MaterialCode = m.
-                CODE LEFT JOIN (
-                SELECT
-                    HandTagCount,
-                    TagQuantity,
-                    CheckTagCount,
-                    MaterialCode,
-                    CheckTime,
-                    RecordId
-                FROM
-                    (
-                        SELECT
-                            scd.HandTagCount,
-                            scd.TagQuantity,
-                            scd.CheckTagCount,
-                            scd.MaterialCode,
-                            scd.CheckTime,
-                            scd.RecordId,
-                            ROW_NUMBER() over ( PARTITION BY MaterialCode ORDER BY CheckTime DESC ) r_index
-                        FROM
-                            stock_checkrecorddetail scd
-                        WHERE
-                            CheckTime IS NOT NULL
-                    ) aaa
-                WHERE
-                    r_index = 1
-            ) a ON m.CODE = a.MaterialCode
-                LEFT JOIN stock_checkrecord sc ON a.RecordId = sc.ID
-                LEFT JOIN u_user uu ON uu.id = sc.OperUserId
-                LEFT JOIN material_category mc ON mc.CODE = m.CategoryCode
-            ${ew.customSqlSegment}
+        SELECT t.*,
+               t2.changeNum
+        FROM (
+                 SELECT m.ID                                       AS materialId,
+                        mc.NAME                                    AS categoryName,
+                        m.NAME                                     AS materialName,
+                        m.CODE                                     AS materialCode,
+                        m.Width                                    AS materialWidth,
+                        sum(sd.Quantity)                           AS sum,
+                        count(sd.Quantity)                         AS count,
+                        m.SafetyStock                              AS materialSafetyStock,
+                        IF(a.CheckTagCount = a.TagQuantity AND
+                           a.CheckTagCount = a.HandTagCount, 1, 0) AS inventoryResults,
+                        ifnull(a.CheckTagCount - a.TagQuantity, 0) AS correctionQuantity,
+                        a.CheckTime                                AS checkTime,
+                        uu.RealName                                AS OperUserName
+                 FROM material m
+                          LEFT JOIN stock_detail sd ON sd.MaterialCode = m.`code`
+                          LEFT JOIN (
+                     SELECT HandTagCount,
+                            TagQuantity,
+                            CheckTagCount,
+                            MaterialCode,
+                            CheckTime,
+                            RecordId
+                     FROM (SELECT scd.HandTagCount,
+                                  scd.TagQuantity,
+                                  scd.CheckTagCount,
+                                  scd.MaterialCode,
+                                  scd.CheckTime,
+                                  scd.RecordId,
+                                  row_number() over ( PARTITION BY MaterialCode ORDER BY CheckTime DESC ) AS r_index
+                           FROM stock_checkrecorddetail scd
+                           WHERE CheckTime IS NOT NULL) aaa
+                     WHERE r_index = 1
+                 ) a ON m.CODE = a.MaterialCode
+                          LEFT JOIN stock_checkrecord sc ON a.RecordId = sc.ID
+                          LEFT JOIN u_user uu ON uu.id = sc.OperUserId
+                          LEFT JOIN material_category mc ON mc.CODE = m.CategoryCode
+                     ${ew.customSqlSegment}
+             ) t
+                 LEFT JOIN (
+            SELECT swd.materialCode,
+                   sum(swd.ChangeNum) changeNum
+            FROM stock_waterdetial swd
+            WHERE datediff(now(), swd.CreatedTime) &lt; 30
+              AND swd.StockChangeType IN (20, 23)
+            GROUP BY swd.MaterialCode
+        ) t2 on t2.materialCode = t.materialCode
+        order by t2.changeNum desc
     </select>
 
     <select id="selectMaterialHouse" resultType="java.util.Map">

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockBackServiceImpl.java

@@ -379,7 +379,7 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
 
         QueryWrapper<Object> wrapper = Wrappers.query()
                 .eq("uu.IsDelete", 0)
-                .in("uu.DepartmentID", "A007", "A008", "A012","A017")
+                .in("uu.DepartmentID", "A007", "A008", "A012", "A017")
                 .isNotNull("uu.JobNo");
 
         return baseMapper.userStatistics(wrapper);
@@ -398,18 +398,21 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
 
         String status = condition.get("status");
 
+        String userName = condition.get("userName");
+        String materialName = condition.get("materialName");
 
         return Wrappers.query()
                 .between("sb.operation_time", beginTime, endTime)
-                .eq(ObjectUtil.isNotEmpty(userId), "uu.ID", userId)
+                .eq(ObjectUtil.isNotEmpty(userId), "ac.ID", userId)
                 .func(ObjectUtil.isNotEmpty(status), q -> {
                     if (Objects.equals(status, "0") || Objects.equals(status, "1")) {
                         q.eq("sb.status", status);
                     } else {
                         q.eq("sbd.flow_status", 0);
                     }
-                });
-
+                })
+                .like(ObjectUtil.isNotEmpty(userId), "uu.RealName", userName)
+                .like(ObjectUtil.isNotEmpty(materialName), "m.Name", materialName);
     }
 
 }

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockWaterServiceImpl.java

@@ -695,8 +695,6 @@ public class StockWaterServiceImpl extends ServiceImpl<StockWaterMapper, StockWa
                 wrapper.eq("m.Purpose", purpose);
             }
         }
-
-        wrapper.orderByDesc("sum(sd.Quantity)");
         return wrapper;
     }
 

hx-service/victoriatourist/src/main/java/com/fjhx/config/LogicDeleteInterceptor.java

@@ -40,7 +40,6 @@ public class LogicDeleteInterceptor implements InnerInterceptor {
      */
     private static final List<String> delFlagTableNameList = Arrays.asList();
 
-
     @SneakyThrows
     @Override
     public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds,
@@ -111,7 +110,7 @@ public class LogicDeleteInterceptor implements InnerInterceptor {
         }
 
         // 当有 mainTable 时，进行 where 条件追加
-        if (CollectionUtils.isNotEmpty(mainTables)) {
+        if (CollectionUtils.isNotEmpty(mainTables) && (where == null || !where.toString().contains(delFlagName))) {
             plainSelect.setWhere(builderExpression(where, mainTables));
         }
     }