修改盘库接口

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;
@@ -15,5 +18,13 @@ public class EquipmentListDto {
         private String num;
         private String state;
         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/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,7 +24,7 @@ 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("orgId") Long orgId,@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);
 

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

@@ -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=")">