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/BussinessInventoryDto.java

@@ -15,6 +15,7 @@ public class BussinessInventoryDto implements Serializable {
     private String addNum;
     private String deleteNum;
     private String state;
+    private String accountNum;
     private List<EquipmentListDto> equipmentList;
 
 }
\ No newline at end of file

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

@@ -14,4 +14,6 @@ public class EquipmentListDto {
         private String fixNumber;
         private String num;
         private String state;
+        private String accountNumber;
+
 }

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

+package com.junmp.jyzb.api.bean.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+@Data
+public class InventoryMapDto {
+    private String id;
+    private String warehouseId;
+    private String warehouseName;
+    private Long orgId;
+    private String orgName;
+    private String typeId;
+    private String typeName;
+    private String sizeId;
+    private String sizeName;
+    private String num;
+    private BigDecimal price;
+    private Date productionDate;
+    private Integer maintenancePeriod;
+    private Integer warrantyPeriod;
+}
\ No newline at end of file

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

+package com.junmp.jyzb.api.bean.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class ViewEquipmentDto implements Serializable {
+    private String epc;
+
+    private String sizeId;
+
+    private String sizeName;
+    private String typeId;
+    private String typeName;
+}
\ No newline at end of file

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

+package com.junmp.jyzb.api.bean.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+    @Data
+    public class WarehouseInvDto implements Serializable {
+        private String epc;
+
+        private String locationId;
+
+        private String orgId;
+
+        private String orgName;
+
+}

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

+package com.junmp.jyzb.api.bean.req;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.junmp.jyzb.api.util.WsWarehouseReq;
+import com.junmp.v2.common.bean.request.ValidationApi;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class UpdateDetailReq {
+
+    @NotBlank(message = "明细Id", groups = {ValidationApi.edit.class})
+    private String detailId;
+
+
+    private List<eqList> eqList;
+
+
+    @Data
+    // 内部类
+    public static class eqList {
+        private String productionDate;
+
+        private String warrantyPeriod;
+
+        private String maintenancePeriod;
+        private String num;
+        private String price;
+    }
+
+}
\ No newline at end of file

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

@@ -15,7 +15,7 @@ public class UpdateInventoryReq   {
     /**
      * id
      */
-    @NotBlank(message = "id不能为空", groups = {ValidationApi.add.class,ValidationApi.edit.class})
+    @NotBlank(message = "id不能为空", groups = {ValidationApi.edit.class})
     private String id;
 
     private String applyTime;

jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/InventoryExceptionEnum.java

@@ -13,6 +13,7 @@ public enum InventoryExceptionEnum implements IExceptionEnum {
     ORDER_NOT_EXIST(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"盘点单据不存在"),
     ORDER_HAS_START(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"单据已经开始，请勿重复操作"),
     RUNNINGORDER_EXIST(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"已存在盘点单据"),
+    ORDER_CLOSED(CommonConstant.DEFAULT_BIZ_ERROR_CODE,"单据已结算，无法重复操作"),
     /**
      * 装备不存在
      */

jyzb-biz/src/main/java/com/junmp/jyzb/controller/BussinessInventoryController.java

@@ -4,6 +4,7 @@ package com.junmp.jyzb.controller;
 import cn.hutool.core.util.ObjectUtil;
 import com.junmp.jyzb.api.bean.dto.BussinessInventoryDto;
 import com.junmp.jyzb.api.bean.query.BussinessInventoryReq;
+import com.junmp.jyzb.api.bean.req.UpdateDetailReq;
 import com.junmp.jyzb.api.bean.req.UpdateInventoryReq;
 import com.junmp.jyzb.api.bean.req.UploadInventoryReq;
 import com.junmp.jyzb.entity.BussinessInventory;
@@ -91,6 +92,12 @@ BussinessInventoryController {
         //判断是否有工作流id，如果有则将状态进行修改
         return ApiRes.success(BussinessInventoryService.UploadStock(req));
     }
+    @PostMapping(path="/UpdateDetail",name="修改盘点单人工明细信息#logType=30")
+    @ApiOperation("修改盘点单人工明细信息")
+    public ApiRes<Boolean> UpdateDetail (@RequestBody UpdateDetailReq req){
+        //判断是否有工作流id，如果有则将状态进行修改
+        return ApiRes.success(BussinessInventoryService.UpdateDetail(req));
+    }
     //盘库申请
     @PostMapping(path="/UseOrFinished",name="确认结果/结束盘点#logType=30")
     @ApiOperation("确认结果/结束盘点")

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

@@ -67,6 +67,8 @@ public class BussinessDetail implements Serializable {
      */
     @TableField(value = "stock_price")
     private BigDecimal stockPrice;
+    @TableField(value = "price")
+    private BigDecimal price;
     /**
      * 月
      */
@@ -88,7 +90,11 @@ public class BussinessDetail implements Serializable {
      */
     @TableField(value = "state")
     private String state;
-
+    /**
+     * 人工添加数量
+     */
+    @TableField(value = "account_num")
+    private String accountNum;
 
     /**
      * 创建时间

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

@@ -157,7 +157,7 @@ public class BussinessInventory implements Serializable {
      * 需要更新的epc汇总
      */
     @TableField(value = "epc_update")
-    private String epc_update;
+    private String epcUpdate;
 
     /**
      * 归还人

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

+package com.junmp.jyzb.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@TableName(value ="bussiness_inventory_children_detail")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class BussinessInventoryChildrenDetail implements Serializable {
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    @Id
+    private String id;
+
+    /**
+     * 工作流id
+     */
+    @TableField(value = "inv_detail_id")
+    private String InvDetailId;
+
+    /**
+     * 是否已使用
+     */
+    @TableField(value = "is_use")
+    private Integer isUse;
+    /**
+     * 工作流id
+     */
+    @TableField(value = "production_date")
+    private String productionDate;
+    /**
+     * 工作流id
+     */
+    @TableField(value = "warranty_period")
+    private String warrantyPeriod;
+    /**
+     * 单据编号
+     */
+    @TableField(value = "maintenance_period")
+    private String maintenancePeriod;
+
+    /**
+     * 年度
+     */
+    @TableField(value = "num")
+    private Integer num;
+
+    /**
+     * 月
+     */
+    @TableField(value = "price")
+    private Integer price;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time",fill = FieldFill.UPDATE)
+    private Date updateTime;
+
+
+    private static final long serialVersionUID = 1L;
+
+}
\ No newline at end of file

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

@@ -35,6 +35,8 @@ public class Inventory implements Serializable {
      */
     @TableField("type_id")
     private String typeId;
+    @TableField("epc_type")
+    private Integer epcType;
 
     @TableField(exist = false)
     private String typeName;

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

@@ -26,7 +26,8 @@ public class WarehouseInventory implements Serializable {
      */
     @TableField(value = "org_id")
     private Long orgId;
-
+    @TableField(value = "epc_type")
+    private Integer epcType;
     /**
      * 类型id
      */

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

+package com.junmp.jyzb.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgEqsDto;
+import com.junmp.jyzb.entity.BussinessDetail;
+import com.junmp.jyzb.entity.BussinessInventoryChildrenDetail;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface BussinessInventoryChildrenDetailMapper extends BaseMapper<BussinessInventoryChildrenDetail> {
+
+
+//    List<TjOrgEqsDto> getByOrgId(@Param("orgId") Long orgId);
+}
+
+
+
+
+

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

@@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.junmp.jyzb.api.bean.PeriodAndDateDto;
-import com.junmp.jyzb.api.bean.dto.EqsBriefDto;
-import com.junmp.jyzb.api.bean.dto.EqsSumDto;
+import com.junmp.jyzb.api.bean.dto.*;
 import com.junmp.jyzb.api.bean.dto.FetchingDataDto.EquipmentDto;
-import com.junmp.jyzb.api.bean.dto.InventoryDto;
 import com.junmp.jyzb.api.bean.query.InventoryReq;
 import com.junmp.jyzb.api.bean.req.BatchEditingInvsReq;
 import com.junmp.jyzb.api.bean.req.InvExpireReq;
@@ -29,6 +27,13 @@ public interface InventoryMapper extends BaseMapper<Inventory> {
 
 
     //根据单警柜统计装备信息
+    List<WarehouseInvDto> GetViewWarehouseInv(@Param("warehouseId") Long orgId,@Param("typeIdsList") List<String> typeIdsList,@Param("sizeIds") List<String> sizeIds);
+    List<ViewEquipmentDto> GetViewEquipment(@Param("epcList") List<String> epcList);
+
+    List<InventoryMapDto> GetViewInventoryMap(@Param("warehouseId") String warehouseId);
+
+    Boolean deleteByEpcs(@Param("list") List<String> epcs);
+    //根据单警柜统计装备信息
     boolean SetCabinetInventory(@Param("brokenNumberDays") Integer brokenNumberDays);
 
     //根据仓库统计装备信息

jyzb-biz/src/main/java/com/junmp/jyzb/service/BussinessInventoryChildrenDetailService.java

+package com.junmp.jyzb.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.entity.BussinessDetail;
+import com.junmp.jyzb.entity.BussinessInventoryChildrenDetail;
+
+
+public interface BussinessInventoryChildrenDetailService extends IService<BussinessInventoryChildrenDetail> {
+
+
+}
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/service/BussinessInventoryService.java

@@ -5,10 +5,7 @@ import com.junmp.jyzb.api.bean.dto.BusFormDto;
 import com.junmp.jyzb.api.bean.dto.BussinessInventoryDto;
 import com.junmp.jyzb.api.bean.query.BussinessInventoryReq;
 import com.junmp.jyzb.api.bean.query.QueryBusFormReq;
-import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
-import com.junmp.jyzb.api.bean.req.UpdateInventoryReq;
-import com.junmp.jyzb.api.bean.req.UpdateStocktakeReq;
-import com.junmp.jyzb.api.bean.req.UploadInventoryReq;
+import com.junmp.jyzb.api.bean.req.*;
 import com.junmp.jyzb.entity.BusForm;
 import com.junmp.jyzb.entity.BussinessInventory;
 import com.junmp.v2.db.api.page.PageResult;
@@ -31,5 +28,6 @@ public interface BussinessInventoryService extends IService<BussinessInventory>
     BussinessInventoryDto GetDetailById(BussinessInventoryReq req);
 
     Boolean UploadStock(UploadInventoryReq req);
+    Boolean UpdateDetail(UpdateDetailReq req);
     Boolean UseOrFinished(UploadInventoryReq req);
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/InventoryService.java

@@ -21,12 +21,10 @@ import java.util.Date;
 import java.util.List;
 
 public interface InventoryService extends IService<Inventory> {
+
     //根据装备id查询出装备的详细信息
     InventoryDto getInventoryDetail(InventoryReq msg);
 
-
-
-
     boolean UpdateWarehouseInsNum(WarehouseReq req);
 
     boolean UpdateCabinetInsNum(CabinetReq req);

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

+package com.junmp.jyzb.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.jyzb.entity.BussinessDetail;
+import com.junmp.jyzb.entity.BussinessInventoryChildrenDetail;
+import com.junmp.jyzb.mapper.BussinessInventoryChildrenDetailMapper;
+import com.junmp.jyzb.mapper.BussinessInventoryDetailMapper;
+import com.junmp.jyzb.service.BussinessInventoryChildrenDetailService;
+import com.junmp.jyzb.service.BussinessInventoryDetailService;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class BussinessInventoryChildrenDetailServiceImpl extends ServiceImpl<BussinessInventoryChildrenDetailMapper, BussinessInventoryChildrenDetail>
+        implements BussinessInventoryChildrenDetailService {
+}
\ No newline at end of file

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

@@ -115,6 +115,8 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
     private InventorySummaryMapper inventorySummaryMapper;
 
 
+
+
     //根据装备id查询出装备的详细信息
     @Override
     public InventoryDto getInventoryDetail(InventoryReq req) {

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

@@ -38,7 +38,57 @@
   </sql>
 
 
+    <select id="GetViewEquipment" resultType="com.junmp.jyzb.api.bean.dto.ViewEquipmentDto">
+        SELECT
+        *
+        FROM
+        view_equipment
+        WHERE
+
+             epc IN
+            <foreach collection="epcList " item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+
+    </select>
+
+    <select id="GetViewWarehouseInv" resultType="com.junmp.jyzb.api.bean.dto.WarehouseInvDto">
+        SELECT
+        epc, orgId, locationId, orgName
+        FROM
+        view_warehouse_inv
+        WHERE
+        orgId = #{orgId}
+
+        <if test="typeIdsList!=null and typeIdsList.size() > 0">
+            AND type_id IN
+            <foreach collection="typeIdsList " item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
 
+        <if test="sizeIds != null and sizeIds.size() > 0">
+            AND size_id IN
+            <foreach item="item" collection="sizeIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
+    <select id="GetViewInventoryMap" resultType="com.junmp.jyzb.api.bean.dto.InventoryMapDto"
+            parameterType="java.lang.String">
+        select * from view_inventory_map
+        where warehouseId=#{warehouseId}
+    </select>
+
+    <delete id="deleteByEpcs" parameterType="java.util.List">
+        DELETE FROM inventory
+        WHERE epc IN
+        <foreach item="item" index="index" collection="list"
+                 open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
 
 <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,