修改记账给出装备接口，修改单据查询审核条件

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

@@ -111,7 +111,7 @@ public class InventoryReq extends BaseRequest {
     /**
      * 生产日期
      */
-    private DateTime productionDate;
+    private Date productionDate;
 
     /**
      * 质保期
@@ -128,8 +128,9 @@ public class InventoryReq extends BaseRequest {
      */
     private Integer fixCount;
     /**
-     * 超期状态
+     * 超期状态(-1查询全部的物资，包括超期的物资，0是未超期的物资，1为已超期的物资)
      */
+    @NotNull(message = "超期状态不能为空",groups = {export.class})
     private Integer termState;
     /**
      * 位置类型
@@ -192,4 +193,7 @@ public class InventoryReq extends BaseRequest {
 
     private List<InventoryReq> eqsList;
 
+    private String startTime;
+    private String endTime;
+
 }

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

@@ -132,6 +132,11 @@ public class OrderMainReq extends BaseRequest {
 
     private Integer orderCurrentState;
 
+    /**
+     * 是否可见全部单子（1是，0否）
+     */
+    private Integer isAllVisible;
+
 }
 
 

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

@@ -221,4 +221,8 @@ public class QueryBusFormReq extends BaseRequest {
      * 单据上次状态（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
      */
     private String orderLastState;
+    /**
+     * 是否可见全部单子（1是，0否）
+     */
+    private Integer isAllVisible;
 }

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

@@ -195,5 +195,10 @@ public class UpdateBusFormReq extends BaseRequest {
      */
     private String orderLastState;
 
+    /**
+     * 是否可见全部单子（1是，0否）
+     */
+    private Integer isAllVisible;
+
 }
 

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

 package com.junmp.jyzb.api.bean.req;
 
 import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.DetailJsonReq;
+import com.junmp.jyzb.api.bean.query.InventoryReq;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -90,6 +91,9 @@ public class UpdateOrderDetailReq implements Serializable {
     private Long orgId;
     private List<DetailJsonReq> childJson;
 
+    //具体epc的值
+    private List<InventoryReq> inventoryList;
+
     //Epc类型（0固定资产1库存物资非固定资产）
     private Integer property;
 

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

@@ -182,5 +182,10 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
     private String eqsJson;
 
     private Integer orderCurrentState;
+
+    /**
+     * 是否可见全部单子（1是，0否）
+     */
+    private Integer isAllVisible;
 }
 

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

@@ -41,7 +41,7 @@ public class Warehouse implements Serializable {
     private String updateUser;
 
     @TableField("org_id_int")
-    private Long orgId;
+    private Long orgIdInt;
 
     @TableField("is_locked")
     private Integer isLocked;

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

@@ -44,6 +44,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.management.remote.rmi._RMIConnection_Stub;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -234,12 +235,11 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
         startProcessInstanceDTO.setTypeOrder("bussinessOrder");
         startProcessInstanceDTO.setUserId(req.getApplyUserId());
         startProcessInstanceDTO.setBussinessType(req.getBussinessType());
-        //设置领用人
-        startProcessInstanceDTO.setUserName(ObjectUtil.isNotNull(req.getReturnUser())?req.getReturnUser():null);
         //发物单位和收物单位
         switch (req.getBussinessType()){
             case "use":
                 startProcessInstanceDTO.setStartOrgName(req.getOrgName());
+                startProcessInstanceDTO.setUserName(req.getReturnUser());
                 break;
             case "purchase":
                 startProcessInstanceDTO.setStartOrgName(req.getSupplierName());
@@ -597,6 +597,11 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
             eq.in( BusForm::getExamineState,examineStateList);
         } else if (ObjectUtil.isNotNull(req.getExamineState()) && req.getExamineState().equals("finished")) {
             eq.eq(ObjectUtil.isNotNull(req.getExamineState() ) && !req.getExamineState().trim().isEmpty(), BusForm::getExamineState, req.getExamineState());
+        }else if(ObjectUtil.isNotNull(req.getExamineState()) && req.getExamineState().equals("approved")){
+            List<String> examineStateList=new ArrayList<>();
+            examineStateList.add("finished");
+            examineStateList.add("refuse");
+            eq.in( BusForm::getExamineState,examineStateList);
         }
 
         //报废、销毁的业务类型
@@ -608,16 +613,19 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
         }else {
             eq.eq(ObjectUtil.isNotNull(req.getBussinessType()) && !req.getBussinessType().trim().isEmpty(), BusForm::getBussinessType, req.getBussinessType());
         }
-        //领用人
-        if (ObjectUtil.isNotNull(req.getUserId()) && req.getBussinessType().equals("use")){
-            //当前登录人
-            eq.eq(BusForm::getReturnUserId,req.getUserId());
-        }else {
-            LoginUser StartUser= LoginContext.getContext().getLoginUser();
-            //当前登录人
-            eq.and(wrapper-> wrapper.eq(BusForm::getAgentId,StartUser.getUserId())
-                    .or()
-                    .like(BusForm::getHistoryAssign,StartUser.getUserId()));
+       //判断单子是否全部可见（0不是，1是）
+        if (ObjectUtil.isNotNull(req.getIsAllVisible()) && req.getIsAllVisible()!=0) {
+            //领用人
+            if (ObjectUtil.isNotNull(req.getUserId()) && req.getBussinessType().equals("use")) {
+                //当前登录人
+                eq.eq(BusForm::getReturnUserId, req.getUserId());
+            } else {
+                LoginUser StartUser = LoginContext.getContext().getLoginUser();
+                //当前登录人
+                eq.and(wrapper -> wrapper.eq(BusForm::getAgentId, StartUser.getUserId())
+                        .or()
+                        .like(BusForm::getHistoryAssign, StartUser.getUserId()));
+            }
         }
         if (req.getBussinessType().equals("allocate")){
             if (req.getStartOrgId()!=null){

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

@@ -327,8 +327,8 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
             List<InventorySummary> inventorySummaryList = inventorySummaryMapper.selectSumByItems(searchItem);
             if (inventorySummaryList.size()==1){//等于1表示他修改后的单价的汇总信息没有，需要新增一条
                 InventorySummary is = inventorySummaryList.get(0);
-                is.setStockNumber(is.getStockNumber()-size);
-                is.setNumber(is.getNumber()-size);
+                is.setStockNumber(Math.max(is.getStockNumber()-size,0));
+                is.setNumber(Math.max(is.getNumber()-size,0));
                 is.setPrice(is.getUnitPrice().multiply(BigDecimal.valueOf(is.getNumber())));
                 if (is.getNumber()==0 && is.getStockNumber()==0 && is.getOutboundNumber()==0 && is.getDestructionNumber()==0){
                     delList.add(is);
@@ -382,16 +382,22 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
                 throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
             }else {
                 //批量修改个别装备
+//                List<Inventory> collect = list.stream().map(inventory -> {
+//                    BeanPlusUtil.copyProperties(req,inventory );
+//                    if (ObjectUtil.isNotNull(req.getShelfColumns()) && !req.getShelfColumns().toString().trim().isEmpty()
+//                            && ObjectUtil.isNotNull(req.getShelfRanges()) && !req.getShelfRanges().toString().trim().isEmpty()
+//                            && ObjectUtil.isNotNull(req.getShelfRows()) && !req.getShelfRows().toString().trim().isEmpty()) {
+//                        inventory.setShelfLocation(req.getShelfRanges() + "/" + req.getShelfColumns() + "/" + req.getShelfRows());
+//                    }
+//                    return inventory;
+//                }).collect(Collectors.toList());
+//                List<Inventory> list1 = list(new LambdaQueryWrapper<Inventory>().eq(Inventory::getId, list));
                 List<Inventory> collect = list.stream().map(inventory -> {
-                    BeanPlusUtil.copyProperties(req,inventory );
-                    if (ObjectUtil.isNotNull(req.getShelfColumns()) && !req.getShelfColumns().toString().trim().isEmpty()
-                            && ObjectUtil.isNotNull(req.getShelfRanges()) && !req.getShelfRanges().toString().trim().isEmpty()
-                            && ObjectUtil.isNotNull(req.getShelfRows()) && !req.getShelfRows().toString().trim().isEmpty()) {
-                        inventory.setShelfLocation(req.getShelfRanges() + "/" + req.getShelfColumns() + "/" + req.getShelfRows());
-                    }
+                    inventory.setWarrantyPeriod(req.getWarrantyPeriod());
+                    inventory.setMaintenancePeriod(req.getMaintenancePeriod());
+                    inventory.setPrice(req.getPrice());
                     return inventory;
                 }).collect(Collectors.toList());
-
                 return updateBatchById(collect);
             }
 

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

@@ -463,6 +463,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                 case "return":
                     startProcessInstanceDTO.setStartOrgName(req.getEndOrgName());
                     startProcessInstanceDTO.setEndOrgName(req.getEndOrgName());
+                    startProcessInstanceDTO.setUserName(req.getReturnUser());
                 case "allocate":
                     startProcessInstanceDTO.setStartOrgName(req.getStartOrgName());
                     startProcessInstanceDTO.setEndOrgName(req.getEndOrgName());
@@ -474,10 +475,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                 case "use":
                     startProcessInstanceDTO.setStartOrgName(req.getStartOrgName());
                     startProcessInstanceDTO.setEndOrgName(req.getStartOrgName());
-                    break;
-                case "return":
-                    startProcessInstanceDTO.setStartOrgName(req.getEndOrgName());
-                    startProcessInstanceDTO.setEndOrgName(req.getEndOrgName());
+                    startProcessInstanceDTO.setUserName(req.getReturnUser());
                     break;
                 case "allocate":
                     startProcessInstanceDTO.setStartOrgName(req.getStartOrgName());
@@ -992,7 +990,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         //将组织机构下面的所有仓库进行查询
         //判断传递的订单主id是否存在
         OrderMain orderMain = orderMainExist(req.getId());
-        List<Warehouse> warehouseList = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getOrgId,
+        List<Warehouse> warehouseList = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getOrgIdInt,
                 orderMain.getOrderType().equals("in") ? orderMain.getEndOrgId() : orderMain.getStartOrgId()));
         Map<String,Warehouse> warehouseMap=new HashMap<>();
         warehouseList.forEach(warehouse -> warehouseMap.put(warehouse.getId(), warehouse));
@@ -1051,6 +1049,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                 WarehouseInventory warehouseInventory=new WarehouseInventory();
                 if (uploadDetailReq.getModifyQuantity() >= 0 ){
 
+                    //遍历子单据下面的详细记账信息
                     for (DetailJsonReq detailJsonReq:JsonList) {
                         if (!warehouseMap.isEmpty()){
                             //判断是否有key存在，如果没有直接报错

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

@@ -86,8 +86,9 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         Warehouse warehouse = WarehoustExist(req.getId());
         WarehouseDto warehouseDto = new WarehouseDto();
         BeanPlusUtil.copyProperties(warehouse,warehouseDto);
+        warehouseDto.setOrgId(warehouse.getOrgIdInt());
         //获取组织机构名称
-        PubOrg pubOrg = pubOrgService.PubOrgExist(warehouse.getOrgId());
+        PubOrg pubOrg = pubOrgService.PubOrgExist(warehouse.getOrgIdInt());
         warehouseDto.setOrgName(pubOrg.getOrgName());
         return warehouseDto;
     }
@@ -138,10 +139,10 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         List<Warehouse> list = new ArrayList<>();
         if (ObjectUtil.isNull(state) || (state!=1 && state!=0)){
             list = list(new LambdaQueryWrapper<Warehouse>()
-                    .eq(Warehouse::getOrgId, orgId));
+                    .eq(Warehouse::getOrgIdInt, orgId));
         }else {
             list = list(new LambdaQueryWrapper<Warehouse>()
-                    .eq(Warehouse::getOrgId, orgId)
+                    .eq(Warehouse::getOrgIdInt, orgId)
                     .eq(Warehouse::getState,state));
         }
 
@@ -149,6 +150,7 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
             WarehouseDto warehouseDto = new WarehouseDto();
             BeanPlusUtil.copyProperties(warehouse,warehouseDto);
             warehouseDto.setOrgName(orgName);
+            warehouseDto.setOrgId(warehouse.getOrgIdInt());
             warehouseDtoList.add(warehouseDto);
         }
         return warehouseDtoList;
@@ -170,7 +172,7 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         List<Warehouse> allWarehouse = new ArrayList<>();
 
         LambdaQueryWrapper<Warehouse> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(Warehouse::getOrgId, allOrgId);
+        queryWrapper.in(Warehouse::getOrgIdInt, allOrgId);
 
         allWarehouse = warehouseMapper.selectList(queryWrapper);
         return allWarehouse;
@@ -184,7 +186,7 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         BeanPlusUtil.copyProperties(req, warehouse);
         warehouse.setUpdateTime(DateTimeUtil.getCurrentDateTime());
         MQDto mqDto = new MQDto();
-        mqDto.setApi("warehouseState");
+        mqDto.setApi("WarehouseState");
         mqDto.setWarehouseId(req.getId());
         if (req.getState()==1){
             mqDto.setMessage("仓库启用");
@@ -194,7 +196,7 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
             mqDto.setWarehouseState(0);
         }
         mqDto.setType(10);
-        MQ.SendMsg("warehouseMsg",req.getOrgId().toString(),mqDto);//推送至仓库主机
+        MQ.SendMsg("warehouseMsg",warehouse.getOrgIdInt().toString(),mqDto);//推送至仓库主机
 
         return this.updateById(warehouse);
     }

jyzb-biz/src/main/java/com/junmp/jyzb/utils/DateTimeUtil.java

@@ -46,6 +46,8 @@ public class DateTimeUtil {
         }
     }
 
+
+
     //String->Long(将string类型的时间转成时间戳)
     public static Long TimeStringToLong(String time){
         if (ObjectUtil.isNotNull(time) && !time.trim().isEmpty()){
@@ -72,4 +74,22 @@ public class DateTimeUtil {
         }
     }
 
+    //String  -> Date(将string类型转成Date)
+    public static Date TimeStringToDate(String time){
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date parse = null;
+        try {
+            parse = format.parse(time);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+        return parse;
+    }
+    //将Date ->String （将Date转成String
+    public static String TimeDateToString(Date time){
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String format1 = format.format(time);
+        return format1;
+    }
+
 }
\ No newline at end of file

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

@@ -764,6 +764,9 @@
             <if test="req.locationType !='all' and req.locationType != null">
                 and wi.location_type=#{req.locationType}
             </if>
+            <if test="req.warehouseId != null and req.warehouseId != ''">
+                and wi.location_id =#{req.warehouseId}
+            </if>
             <if test="req.termState!= -1">
                 and i.term_state=#{req.termState}
             </if>
@@ -776,6 +779,12 @@
             <if test="req.price !=null and req.price != ''">
                 and i.price=#{req.price}
             </if>
+            <if test="req.warrantyPeriod != null and req.warrantyPeriod != ''">
+                and i.warranty_period=#{req.warrantyPeriod}
+            </if>
+            <if test="req.maintenancePeriod != null and req.maintenancePeriod != ''">
+                and i.maintenance_period=#{req.maintenancePeriod}
+            </if>
 
             ORDER BY wi.type_id,i.size_id
         ) as a
@@ -801,6 +810,9 @@
         <if test="req.locationType !='all' and req.locationType != null">
             and wi.location_type=#{req.locationType}
         </if>
+        <if test="req.warehouseId != null and req.warehouseId != ''">
+            and wi.location_id =#{req.warehouseId}
+        </if>
         <if test="req.termState!= -1">
           and i.term_state=#{req.termState}
         </if>
@@ -813,6 +825,13 @@
         <if test="req.price !=null and req.price != ''">
             and i.price=#{req.price}
         </if>
+        <if test="req.warrantyPeriod != null and req.warrantyPeriod != ''">
+            and i.warranty_period=#{req.warrantyPeriod}
+        </if>
+        <if test="req.maintenancePeriod != null and req.maintenancePeriod != ''">
+            and i.maintenance_period=#{req.maintenancePeriod}
+        </if>
+
         ORDER BY wi.type_id,i.size_id
         <if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' ">
             limit #{pageNo},#{pageSize}

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

@@ -87,13 +87,15 @@
         <if test="req.orderCurrentState != null and req.orderCurrentState!=''" >
             and order_current_state = 1
         </if>
-        <if test="req.orderType=='in'">
-            and ( end_org_user_id = #{userId}
-            or history_assign like CONCAT('%', #{userId}, '%') or current_assign like CONCAT('%', #{userId}, '%'))
-        </if>
-        <if test="req.orderType=='out' or req.orderType=='OUT'">
-            and (start_org_user_id = #{userId}
-            or history_assign like CONCAT('%', #{userId}, '%') or current_assign like CONCAT('%', #{userId}, '%'))
+        <if test="req.isAllVisible != null and req.isAllVisible!=0">
+            <if test="req.orderType=='in'">
+                and ( end_org_user_id = #{userId}
+                or history_assign like CONCAT('%', #{userId}, '%') or current_assign like CONCAT('%', #{userId}, '%'))
+            </if>
+            <if test="req.orderType=='out' or req.orderType=='OUT'">
+                and (start_org_user_id = #{userId}
+                or history_assign like CONCAT('%', #{userId}, '%') or current_assign like CONCAT('%', #{userId}, '%'))
+            </if>
         </if>
 
         <if test="req.orderState !=null and req.orderState != ''">
@@ -110,9 +112,12 @@
         <if test=" req.examineState=='unaudited'">
             and examine_state in('none','working')
         </if>
-        <if test="req.examineState=='finished'">
+        <if test="req.examineState=='approved'">
             and examine_state in('finished','refuse')
         </if>
+        <if test="req.examineState=='finished'">
+            and examine_state = 'finished'
+        </if>
         <if test="req.startTime != null and req.startTime != ''">
             and create_time &gt;= #{req.startTime}
         </if>

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowInstanceServiceImpl.java

@@ -162,7 +162,7 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
         processVariables.put(START_USER_INFO,JSONObject.toJSONString(StartUser));
         processVariables.put(START_USER,StartUser.getRealName());
         processVariables.put(PROCESS_STATUS,BUSINESS_STATUS_1);
-        //领用人，调岗人
+        //领用人，调岗人,归还人
         if (ObjectUtil.isNotNull(processInstanceDto.getUserName())){
             processVariables.put(USER_NAME,processInstanceDto.getUserName());
         }