修改出入库接口

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

@@ -50,5 +50,5 @@ public class NormalInOutDto {
      */
     private Integer number;
     //出入库状态
-    private String OutInState;
+    private String outInState;
 }

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

@@ -10,6 +10,8 @@ import java.util.List;
 
 @Data
 public class OrderDto implements Serializable {
+
+    private String isPrint;
     private String id;
     /**
      * 单据类型：入库单/出库单

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

@@ -9,7 +9,7 @@ import java.util.Date;
 
 @Data
 public class OrderMainDto implements Serializable {
-
+    private String isPrint;
     private String id;
 
     private String orderType;

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

@@ -94,7 +94,7 @@ public class OrderMainReq extends BaseRequest {
     //排序规则
     private String order;
 
-
+    private String isPrint;
 
     /**
      * 调拨类型（2支拨，1价拨），调拨出入库才有

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

@@ -171,5 +171,8 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
     private String removeLocationName;
     //消息类型（）
     private String api;
+
+    //是否打印
+    private Integer isPrint;
 }
 

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

@@ -157,5 +157,8 @@ public class OrderMain implements Serializable {
     @TableField("remove_location_name")
     private String removeLocationName;
 
+    @TableField("is_print")
+    private String isPrint;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

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

@@ -20,7 +20,7 @@ public class PoliceEquipment implements Serializable {
     /**
      * 主键
      */
-    @TableId(value = "id",type = IdType.AUTO)
+    @TableId(value = "id",type = IdType.ASSIGN_UUID)
     @ApiModelProperty(value = "主键ID")
     private String id;
 

jyzb-biz/src/main/java/com/junmp/jyzb/listener/GlobalEndListener.java

@@ -143,11 +143,6 @@ import java.util.stream.Collectors;
                 }
 
             }
-            if (event.getType() == FlowableEngineEventType.PROCESS_COMPLETED_WITH_TERMINATE_END_EVENT){
-                System.out.println("event.getType() = " + event.getType());
-            }
-            if (event.getType()== FlowableEngineEventType.PROCESS_COMPLETED_WITH_ESCALATION_END_EVENT)
-                System.out.println("event = " + event);
         }
 
     // 获取流程实例关联的变量

jyzb-biz/src/main/java/com/junmp/jyzb/rabbitmq/OutInLogsReceiver.java

@@ -19,7 +19,7 @@ public class OutInLogsReceiver {
     @Resource
     private LogSummaryService logSummaryService;
 
-    @RabbitListener(queues = "2222")//监听队列名
+    @RabbitListener(queues = "orderResult")//监听队列名
     private void a(String msg, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag){
 
         try {

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

@@ -30,6 +30,8 @@ import com.junmp.jyzb.service.*;
 import com.junmp.jyzb.mapper.BusFormMapper;
 import com.junmp.jyzb.utils.CreateNullData;
 import com.junmp.jyzb.utils.DateTimeUtil;
+import com.junmp.v2.auth.api.bean.login.LoginUser;
+import com.junmp.v2.auth.api.context.LoginContext;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.db.api.factory.PageFactory;
@@ -175,6 +177,10 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
             startProcessInstanceDTO.setInvList(req.getInvList());
             //业务类型
             startProcessInstanceDTO.setBussinessType(req.getBussinessType());
+
+            Object A= JSON.toJSONString(req);
+            JSONObject jsonObject = JSON.parseObject(A.toString());
+            startProcessInstanceDTO.setFormData(jsonObject);
             processInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
 
         }
@@ -286,8 +292,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
             BeanPlusUtil.copyProperties(busForm, busFormDto);
             return busFormDto;
         }).collect(Collectors.toList());
-        //创建空的数据返回前端
-
+        //是否创建创建空的数据返回前端
         if(req.getIsCreateNullDate()==null || req.getIsCreateNullDate()){
             Class<BusFormDto> busFormDto=BusFormDto.class;
             List<BusFormDto> nullData = CreateNullData.createNullData(size, req.getPageNo(), busFormDto);
@@ -507,7 +512,13 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
 
         if (ObjectUtil.isNotNull(req.getUserId())){
             //当前登录人
-            eq.and(wrapper-> wrapper.eq(BusForm::getAgentId,req.getUserId()).or().eq(BusForm::getCurrentAssign,req.getUserId()));
+            eq.eq(BusForm::getReturnUserId,req.getUserId());
+        }else {
+            LoginUser StartUser= LoginContext.getContext().getLoginUser();
+            //当前登录人
+            eq.and(wrapper-> wrapper.eq(BusForm::getAgentId,StartUser.getUserId())
+                    .or()
+                    .like(BusForm::getCurrentAssign,StartUser.getUserId()));
         }
         if (req.getBussinessType().equals("allocate")){
             if (req.getStartOrgId()!=null){

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

@@ -179,6 +179,7 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
                     normalInOutDto.setOrgId(logSummary.getOrgId());
                     normalInOutDto.setOrgName(logSummary.getOrgName());
                     normalInOutDto.setNumber(1);
+                    normalInOutDto.setOutInState(logSummary.getOutInState());
                     returnList.add(normalInOutDto);
                 }
                 //判断logSummary是否为采购，

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

@@ -217,6 +217,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                     String.format("%02d",LocalDateTime.now().getMonth().getValue())+
                     String.format("%02d",LocalDateTime.now().getDayOfMonth())+codeValue);
         }
+
         //设置总价格和应出入库数量
         Integer sumNum=0;
         BigDecimal priceTotal=new BigDecimal(0);
@@ -999,6 +1000,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         List<OrderDetail> collect = list.stream().map(orderDetail -> {
             OrderDetail orderDetail1 = new OrderDetail();
             BeanPlusUtil.copyProperties(orderDetail, orderDetail1);
+            orderDetail1.setId(null);
             //修改主单据id
             orderDetail1.setOrderId(orderMain.getId());
             //修改单据出入状态

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

@@ -954,6 +954,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     @Override
     public List<PoliceEquipment> GetPoliceEqs(QueryReassignmentReq req) {
         LambdaQueryWrapper<PoliceEquipment> eq = new LambdaQueryWrapper<PoliceEquipment>();
+
         if (ObjectUtil.isNotNull(req.getPoliceId() )&& ! req.getPoliceId().trim().isEmpty()){
             Policeman policeman = policemanService.PoliceExist(req.getPoliceId());
             eq.eq(PoliceEquipment::getPoliceId, policeman.getId());
@@ -968,10 +969,13 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
                     req.setOrder(req.getOrder().toLowerCase());
                 }
                 Policeman one = policemanService.getOne(new LambdaQueryWrapper<Policeman>().eq(Policeman::getUserId, req.getUserId()));
-                eq.eq(PoliceEquipment::getPoliceId, one.getId())
-                        .like(ObjectUtil.isNotNull(req.getTypeName()),PoliceEquipment::getTypeName,req.getTypeName())
-                        .like(ObjectUtil.isNotNull(req.getSizeName()),PoliceEquipment::getSizeName,req.getSizeName())
-                        .last("order by "+req.getColumn()+ " "+req.getOrder());
+                if (ObjectUtil.isNotNull(one)){
+                    eq.eq(PoliceEquipment::getPoliceId, one.getId())
+                            .like(ObjectUtil.isNotNull(req.getTypeName()),PoliceEquipment::getTypeName,req.getTypeName())
+                            .like(ObjectUtil.isNotNull(req.getSizeName()),PoliceEquipment::getSizeName,req.getSizeName())
+                            .last("order by "+req.getColumn()+ " "+req.getOrder());
+
+                }
                 return policeEquipmentService.list(eq);
             }
             else {

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

@@ -59,6 +59,7 @@ import org.flowable.task.api.history.HistoricTaskInstanceQuery;
 import org.flowable.variable.api.history.HistoricVariableInstance;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import springfox.documentation.spring.web.json.Json;
 
 import javax.annotation.Resource;
 import java.io.InputStream;
@@ -182,7 +183,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         JSONObject formData = handleDataDTO.getFormData();
         String taskId = handleDataDTO.getTaskId();
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
-
+        
         Map<String, Object> map = new HashMap<>();
         if (formData != null && formData.size() > 0) {
             Map formValue = JSONObject.parseObject(formData.toJSONString(), new TypeReference<Map>() {
@@ -570,6 +571,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             BpmnModel bpmnModel = repositoryService.getBpmnModel(historicProcessInstance.getProcessDefinitionId());
 
             String Name= bpmnModel.getMainProcess().getName();
+
             historyProcessInstanceVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
             historyProcessInstanceVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
             historyProcessInstanceVO.setProcessDefinitionName(historicProcessInstance.getProcessDefinitionName());
@@ -583,13 +585,13 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             Boolean flag = historicProcessInstance.getEndTime() == null ? false : true;
             historyProcessInstanceVO.setCurrentActivityName(getCurrentName(historicProcessInstance.getId(), flag, historicProcessInstance.getProcessDefinitionId()));
             historyProcessInstanceVO.setBusinessStatus(MapUtil.getStr(processVariables, PROCESS_STATUS));
-
             historyProcessInstanceVO.setStartOrgName(MapUtil.getStr(processVariables,START_ORG_NAME));
             historyProcessInstanceVO.setEndOrgName(MapUtil.getStr(processVariables,END_ORG_NAME));
             historyProcessInstanceVO.setInvList(MapUtil.getStr(processVariables,INVLIST));
             historyProcessInstanceVO.setBussinessType(MapUtil.getStr(processVariables,BUSSINESS_TYPE));
             historyProcessInstanceVO.setOutInState(MapUtil.getStr(processVariables,OUT_IN_STATE));
-
+            //表单内容
+            historyProcessInstanceVO.setFormData(MapUtil.getStr(processVariables,FORM_VAR));
             long totalTimes = historicProcessInstance.getEndTime() == null ?
                     (Calendar.getInstance().getTimeInMillis() - historicProcessInstance.getStartTime().getTime()) :
                     (historicProcessInstance.getEndTime().getTime() - historicProcessInstance.getStartTime().getTime());
@@ -631,10 +633,16 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 
         HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
                 .processInstanceId(processInstanceId)
+                .includeProcessVariables()
                 .singleResult();
             String deployId = historicProcessInstance.getDeploymentId();
         Map<String, Object> result= Test(processInstanceId,deployId);
         vo.setResult(result);
+
+        String detailJson= MapUtil.getStr(historicProcessInstance.getProcessVariables(),FORM_VAR);
+        vo.setDetailJson(JSON.parseObject(detailJson));
+        //设置类型
+        vo.setType(MapUtil.getStr(historicProcessInstance.getProcessVariables(),BUSSINESS_TYPE));
         Map<String, List<Comment>> commentsMap = processInstanceComments.stream()
                 .collect(Collectors.groupingBy(Comment::getTaskId, Collectors.toList()));
         List<Attachment> processInstanceAttachments = taskService.getProcessInstanceAttachments(processInstanceId);

jyzb-process/src/main/java/com/junmp/junmpProcess/vo/HistoryProcessInstanceVO.java

 package com.junmp.junmpProcess.vo;
 
+import com.alibaba.fastjson.JSONObject;
 import com.junmp.junmpProcess.dto.json.UserInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -45,4 +46,6 @@ public class HistoryProcessInstanceVO {
     private String bussinessType;
     @ApiModelProperty("出入库状态")
     private String outInState;
+    @ApiModelProperty("单据内容")
+    private String formData;
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/vo/RecordVO.java

@@ -11,5 +11,6 @@ public class RecordVO {
     private  List<TaskDetailVO> taskVo;
     Map<String, Object> result;
     JSONObject formJson;
-
+    JSONObject detailJson;
+    String type;
 }