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

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentListDto.java

@@ -3,6 +3,9 @@ package com.junmp.jyzb.api.bean.dto;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
 @Data
 public class EquipmentListDto {
         private String typeId;
@@ -14,6 +17,15 @@ public class EquipmentListDto {
         private String fixNumber;
         private String num;
         private String state;
+        private String price;
         private String accountNumber;
-
+        private List<PriceInfo> priceInfo;
+        @Data
+        public  static   class PriceInfo
+        {
+                private BigDecimal price;
+                private String num;
+                private Integer accountNumber;
+                private BigDecimal stockPrice;
+        }
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/InvSummaryDto.java

+package com.junmp.jyzb.api.bean.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class InvSummaryDto {
+    private String typeId;
+    private String sizeId;
+    private String locationId;
+    private Integer count;
+    private BigDecimal price;
+}

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/InventoryMapDto.java

@@ -11,6 +11,7 @@ public class InventoryMapDto {
     private String id;
     private String warehouseId;
     private String warehouseName;
+    private String childrenId;
     private Long orgId;
     private String orgName;
     private String typeId;

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

@@ -8,9 +8,11 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.poi.hpsf.Decimal;
 import org.springframework.data.annotation.Id;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -25,7 +27,7 @@ public class BussinessInventoryChildrenDetail implements Serializable {
      */
     @TableId(value = "id")
     @Id
-    private String id;
+    private Long id;
 
     /**
      * 工作流id
@@ -39,6 +41,16 @@ public class BussinessInventoryChildrenDetail implements Serializable {
     @TableField(value = "is_use")
     private Integer isUse;
     /**
+     * 是否已使用
+     */
+    @TableField(value = "price")
+    private BigDecimal price;
+    /**
+     *
+     */
+    @TableField(value = "total_price")
+    private BigDecimal totalPrice;
+    /**
      * 工作流id
      */
     @TableField(value = "production_date")
@@ -60,11 +72,6 @@ public class BussinessInventoryChildrenDetail implements Serializable {
     @TableField(value = "num")
     private Integer num;
 
-    /**
-     * 月
-     */
-    @TableField(value = "price")
-    private Integer price;
 
 
     /**

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventoryMapper.java

@@ -24,13 +24,15 @@ public interface InventoryMapper extends BaseMapper<Inventory> {
 
 
     //根据单警柜统计装备信息
-    List<WarehouseInvDto> GetViewWarehouseInv(@Param("warehouseId") Long orgId,@Param("typeIdsList") List<String> typeIdsList,@Param("sizeIds") List<String> sizeIds);
+    List<WarehouseInvDto> GetViewWarehouseInv(@Param("warehouseId") String warehouseId,@Param("typeIdsList") List<String> typeIdsList,@Param("sizeIds") List<String> sizeIds);
     List<ViewEquipmentDto> GetViewEquipment(@Param("epcList") List<String> epcList);
     List<EpcListDto> GetViewCountByepcs(@Param("epcList") List<String> epcList);
 
     List<InventoryMapDto> GetViewInventoryMap(@Param("warehouseId") String warehouseId);
 
     Boolean deleteByEpcs(@Param("list") List<String> epcs);
+    List<InvSummaryDto>  selectWarehouseByEpcs(@Param("list") List<String> epcs,@Param("orgId") String orgId);
+
     //根据单警柜统计装备信息
     boolean SetCabinetInventory(@Param("brokenNumberDays") Integer brokenNumberDays);
 

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

@@ -76,7 +76,7 @@
         FROM
         view_warehouse_inv
         WHERE
-        orgId = #{orgId}
+        locationId = #{warehouseId}
 
         <if test="typeIdsList!=null and typeIdsList.size() > 0">
             AND type_id IN
@@ -100,7 +100,7 @@
     </select>
 
     <delete id="deleteByEpcs" parameterType="java.util.List">
-        DELETE FROM inventory
+        DELETE FROM base_inventory
         WHERE epc IN
         <foreach item="item" index="index" collection="list"
                  open="(" separator="," close=")">
@@ -108,6 +108,26 @@
         </foreach>
     </delete>
 
+    <select id="selectWarehouseByEpcs" resultType="com.junmp.jyzb.api.bean.dto.InvSummaryDto">
+        SELECT
+        bi.type_id as typeId,
+        bi.size_id as sizeId,
+        COUNT(bi.id) AS count,
+        bwi.location_id as locationId,
+        bi.price
+        FROM
+        `base_inventory` `bi`
+        JOIN
+        `base_warehouse_inventory` `bwi` ON `bi`.`epc` = `bwi`.`epc`
+        WHERE bi.epc IN
+        <foreach item="item" index="index" collection="list"
+                 open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and bwi.org_id=#{orgId}
+        GROUP BY
+        bi.size_id, bi.type_id, bi.price,bwi.location_id
+    </select>
 <insert id="SetCabinetInventory">
     INSERT INTO base_inventory_summary_type2 (id,org_id_int,org_name, org_code,type_id,type_name,size_id,size_name,location_id,location_name,
                                         number,unit_price,price,stock_number, outbound_number,destruction_number,expire_number,