Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InventoryReq.java

@@ -198,4 +198,10 @@ public class InventoryReq extends BaseRequest {
 
     private Integer zkCount;
 
+    private Integer stockNum;
+
+    private Integer outBoundNum;
+
+    private Integer property;
+
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/BatchEditingInvsReq.java

 package com.junmp.jyzb.api.bean.req;
 
+import com.junmp.jyzb.api.bean.query.InventoryReq;
 import com.junmp.v2.common.bean.request.ValidationApi;
 import lombok.Data;
 
@@ -39,7 +40,7 @@ public class BatchEditingInvsReq {
     /**
      *装备id
      */
-    private List<String> inventoryIdList;
+    private List<InventoryReq> inventoryList;
 
     /**
      *生产日期

jyzb-biz/src/main/java/com/junmp/jyzb/entity/Inventory.java

@@ -215,4 +215,7 @@ public class Inventory implements Serializable {
     @TableField(value = "property")
     private Integer property;
 
+
+
+
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -1031,6 +1031,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                                     inventory.setLocationType(0);
                                     inventory.setPrice(ObjectUtil.isNull(detailJsonReq.getPrice())?price:detailJsonReq.getPrice());
                                     inventory.setProperty(0);
+                                    inventory.setEpcType(1);
                                     inventory.setState("normal");
                                     inventory.setBussinessState("normal");
                                     inventory.setCreateTime(DateTimeUtil.getCurrentDateTime());
@@ -1053,6 +1054,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                                     warehouseInventory.setLocationState("in");
                                     warehouseInventory.setCreateTime(DateTimeUtil.getCurrentDateTime());
                                     warehouseInventory.setOrgName(orgName);
+                                    warehouseInventory.setEpcType(1);
                                     warehouseInventory.setTypeName(uploadDetailReq.getTypeName());
                                     warehouseInventory.setSizeName(uploadDetailReq.getSizeName());
                                     warehouseInventory.setLocationName(detailJsonReq.getLocationName());
@@ -1894,6 +1896,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                 existingSummary.setStockNumber(existingSummary.getStockNumber() + summary.getStockNumber());
                 existingSummary.setBrokenNumber(existingSummary.getBrokenNumber() + summary.getBrokenNumber());
                 existingSummary.setNumber(existingSummary.getNumber() + summary.getNumber());
+                resultMap.put(key,existingSummary);
             } else {
                 resultMap.put(key, summary);
             }

jyzb-biz/src/main/resources/mapper/EquipmentCountSummaryMapper.xml

@@ -468,7 +468,7 @@
     <select id="GetGroupByCount" resultType="com.junmp.jyzb.api.bean.dto.LargeScreenDto.GroupByCountDto">
         select t.`value`,base_equipment_type.name as `name`,base_equipment_type.id as typeId FROM(
         select sum(bis.number) as value,SUBSTRING_INDEX(et.parent_ids, ",", 1) AS type_parent_id  FROM (
-            select number,type_id FROM base_inventory_summary bis where SUBSTRING( org_code, 1, #{length} ) = #{req.findCode} and bis.location_type=0
+            select number,type_id FROM base_inventory_summary bis where SUBSTRING( org_code, 1, #{length} ) = #{req.findCode}
             <if test="length != 12">
 
                 <if test="req.levelType == 0">
@@ -488,7 +488,7 @@
                sum(outbound_number)as outboundNumber,sum(destruction_number)as destructionNumber,
                sum(expire_number)as expireNumber,sum(broken_number)as brokenNumber,
                sum(fix_number)as fixNumber,sum(use_number)as useNumber
-        FROM base_inventory_summary where SUBSTRING( org_code, 1, #{length} ) = #{req.findCode} and location_type=0
+        FROM base_inventory_summary where SUBSTRING( org_code, 1, #{length} ) = #{req.findCode}
         <if test="length != 12">
 
             <if test="req.levelType == 0">
@@ -591,7 +591,7 @@
             FROM
             `vie_equipment_count_summary`
             WHERE
-            SUBSTRING( org_code, 1, 4 ) = "3302" and year=YEAR(NOW()) and month=MONTH(NOW())
+            SUBSTRING( org_code, 1, #{length} ) = #{req.findCode} and year=YEAR(NOW()) and month=MONTH(NOW())
             <if test="req.levelType == 0">
                 and org_id_int =(select org_id FROM pub_org where find_code=#{req.findCode} ORDER BY level_flag asc limit 0,1 )
             </if>
@@ -610,7 +610,7 @@
             FROM
             `vie_equipment_count_summary`
             WHERE
-            SUBSTRING( org_code, 1, 4 ) = "3302" and year=YEAR(NOW()) and month=MONTH(NOW())
+            SUBSTRING( org_code, 1, #{length} ) = #{req.findCode} and year=YEAR(NOW()) and month=MONTH(NOW())
             <if test="req.levelType == 0">
                 and org_id_int =(select org_id FROM pub_org where find_code=#{req.findCode} ORDER BY level_flag asc limit 0,1 )
             </if>
@@ -628,7 +628,7 @@
             FROM
             `vie_equipment_count_summary`
             WHERE
-            SUBSTRING( org_code, 1, 4 ) = "3302" and year=YEAR(NOW()) and month=MONTH(NOW())
+            SUBSTRING( org_code, 1, #{length} ) = #{req.findCode} and year=YEAR(NOW()) and month=MONTH(NOW())
             <if test="req.levelType == 0">
                 and org_id_int =(select org_id FROM pub_org where find_code=#{req.findCode} ORDER BY level_flag asc limit 0,1 )
             </if>
@@ -670,7 +670,7 @@
      AND level_flag = 2
                     ) AS subquery ON 1=1
                 WHERE
-                    SUBSTRING(base_inventory_summary.org_code, 1, 4) = subquery.find_code and base_inventory_summary.location_type=0
+                    SUBSTRING(base_inventory_summary.org_code, 1, 4) = subquery.find_code
                 GROUP BY
                     type_org_code) as t
     </select>
@@ -700,7 +700,7 @@
              AND level_flag = 2
                  ) AS subquery ON 1=1
              WHERE
-                 SUBSTRING(base_inventory_summary.org_code, 1, 4) = subquery.find_code and base_inventory_summary.location_type=0
+                 SUBSTRING(base_inventory_summary.org_code, 1, 4) = subquery.find_code
              GROUP BY
                 findCode
             ) as t left join pub_org on t.findCode=pub_org.find_code
@@ -721,7 +721,7 @@
         FROM
             base_inventory_summary
         WHERE
-            SUBSTRING(base_inventory_summary.org_code, 1, 4) = #{dto.findCode} and base_inventory_summary.location_type=0
+            SUBSTRING(base_inventory_summary.org_code, 1, 4) = #{dto.findCode}
         GROUP BY type_id
         order by type_id
     </select>

jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml

@@ -807,7 +807,7 @@
 
         SELECT wi.type_id,wi.size_id,wi.shelf_id,wi.shelf_location, wi.epc,wi.org_id,wi.location_state,
                wi.location_type,wi.location_id,i.id,i.supplier_id,i.price,i.state,i.bussiness_state,
-               i.production_date,i.warranty_period,i.maintenance_period, i.term_state,
+               i.production_date,i.warranty_period,i.maintenance_period, i.term_state,i.property,
                i.area_id,et.name as type_name,es.name as size_name,po.org_name as org_name,
                bs.name as supplier_name,COALESCE(bc.name, bw.name) as location_name,
                es.photo as photo,es.instructions as instructions,et.photo as type_photo,es.photo as size_photo

jyzb-boot/src/main/resources/application-prod.yml

@@ -42,7 +42,7 @@ spring:
 
   redis:
     #host: 192.168.3.188
-    host: 192.168.3.188
+    host: 192.168.3.121
     port: 6379
     database: 1
     password: