杰生库存管理

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/base/StorageBaseService.java

@@ -17,25 +17,25 @@ public interface StorageBaseService<T> extends IService<T> {
     /**
      * 获取分页
      */
-    default Page<T> createPage(Map<String, String> condition) {
+    default Page<T> createPage(Map<String, ?> condition) {
         return new Page<>(getCurrent(condition), getSize(condition));
     }
 
     /**
      * 获取分页
      */
-    default Page<Map<String, Object>> createPageMap(Map<String, String> condition) {
+    default Page<Map<String, Object>> createPageMap(Map<String, ?> condition) {
         return new Page<>(getCurrent(condition), getSize(condition));
     }
 
-    default int getCurrent(Map<String, String> condition) {
-        String currentStr = condition.get("pageNum");
-        return ObjectUtil.isEmpty(currentStr) ? 1 : Integer.parseInt(currentStr);
+    default int getCurrent(Map<String, ?> condition) {
+        Object currentObj = condition.get("pageNum");
+        return ObjectUtil.isEmpty(currentObj) ? 1 : Integer.parseInt(currentObj.toString());
     }
 
-    default int getSize(Map<String, String> condition) {
-        String sizeStr = condition.get("pageSize");
-        return ObjectUtil.isEmpty(sizeStr) ? 10 : Integer.parseInt(sizeStr);
+    default int getSize(Map<String, ?> condition) {
+        Object sizeObj = condition.get("pageSize");
+        return ObjectUtil.isEmpty(sizeObj) ? 10 : Integer.parseInt(sizeObj.toString());
     }
 
     /**

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/apply/ApplyPurchaseMapper.xml

@@ -3,8 +3,7 @@
 <mapper namespace="com.fjhx.mapper.apply.ApplyPurchaseMapper">
 
     <select id="getTypeStatisticsList" resultType="java.util.Map">
-        select ap.flow_status,
-               m.technology_type type,
+        select m.technology_type type,
                m.width,
                apd.quantity
         from apply_purchase ap
@@ -14,7 +13,8 @@
     </select>
 
     <select id="flowStatistics" resultType="java.util.Map">
-        select count(0) count, ap.flow_status
+        select count(0) count,
+               ap.flow_status
         from apply_purchase ap
                  inner join apply_purchase_details apd on ap.id = apd.apply_purchase_id
                  left join material m on apd.material_id = m.id

hx-service/storage-restructure/src/main/java/com/fjhx/service/apply/impl/ApplyPurchaseServiceImpl.java

@@ -46,8 +46,7 @@ public class ApplyPurchaseServiceImpl extends ServiceImpl<ApplyPurchaseMapper, A
         // 查询条件
         QueryWrapper<Object> wrapper = Wrappers.query()
                 .between("ap.create_time", beginTime, endTime)
-                .and(ObjectUtil.isNotEmpty(keyword), q -> q.like("m.name", keyword).or().like("m.code", keyword))
-                .orderByDesc("apd.id");
+                .and(ObjectUtil.isNotEmpty(keyword), q -> q.like("m.name", keyword).or().like("m.code", keyword));
 
         List<Map<String, Object>> list = baseMapper.getTypeStatisticsList(wrapper);
 

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

@@ -80,23 +80,23 @@
     </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,
+        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,
+                      0))                                 retentionQuantity,
+               m.SafetyStock                              materialSafetyStock,
                IF((a.CheckTagCount = a.TagQuantity) and (a.CheckTagCount = a.HandTagCount), 1,
-                  0)                           inventoryResults,
-               a.CheckTagCount - a.TagQuantity correctionQuantity,
-               a.CheckTime                     checkTime,
-               uu.RealName                     OperUserName
+                  0)                                      inventoryResults,
+               ifnull(a.CheckTagCount - a.TagQuantity, 0) correctionQuantity,
+               a.CheckTime                                checkTime,
+               uu.RealName                                OperUserName
         FROM material m
-                 INNER JOIN stock_detail sd ON sd.MaterialCode = m.Code
+                 LEFT JOIN stock_detail sd ON sd.MaterialCode = m.Code
                  LEFT JOIN (
             SELECT s.HandTagCount,
                    s.TagQuantity,

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

@@ -530,6 +530,10 @@ public class StockWaterServiceImpl extends ServiceImpl<StockWaterMapper, StockWa
                 .eq("m.CategoryCode", "categoryCode") // 物料分类
                 .getWrapper();
 
+        // 01.
+        // 03.008.
+        wrapper.and(q -> q.likeRight("m.code", "01.").or().likeRight("m.code", "03.008."));
+
         String inventoryResults = condition.get("inventoryResults");
         if ("0".equals(inventoryResults)) {
             wrapper.eq("IF( a.CheckTagCount = a.TagQuantity AND a.CheckTagCount = a.HandTagCount, 1, 0)", inventoryResults);
@@ -538,7 +542,7 @@ public class StockWaterServiceImpl extends ServiceImpl<StockWaterMapper, StockWa
         // 物料分组
         wrapper.groupBy("m.id");
         // 在库
-        wrapper.eq("sd.IsDelete", 0);
+//        wrapper.eq("sd.IsDelete", 0);
 
         // 仓库id
         String houseId = condition.get("houseId");