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

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

+package com.junmp.jyzb.api.bean.dto;
+
+import lombok.Data;
+
+/**
+ * 记账结束之后返回给本地主机的消息结果实体类
+ */
+@Data
+public class MQReturnMsgDto {
+    private String api;
+    private String id;
+    private String orderType;
+}

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

@@ -83,7 +83,7 @@ public class OrderDto implements Serializable {
      * 单据包含的物资集合
      */
     private String  invList;
-
+    private Integer actualQuantity;
 
     /**
      * 明细列表

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

@@ -73,7 +73,7 @@ public class OrderMainDto implements Serializable {
      */
     private Integer manualState;
 
-
+    private Integer actualQuantity;
 
     /**
      * 调拨类型（2支拨，1价拨），调拨出入库才有

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

@@ -34,7 +34,7 @@ public class ReassignmentDto  {
      */
     private String orderCode;
     /**
-     * 调岗警员id
+     * 警员id
      */
     private String policeId;
 

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

@@ -12,7 +12,7 @@ public class PurchaseEqsReq {
     private String typeName;
     private String sizeId;
     private String sizeName;
-    private Date productionDate;
+    private String productionDate;
     private Integer warranyPeriod;
     private Integer maintenancePeriod;
     //仓库id和仓库name

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

@@ -67,7 +67,7 @@ public class UpdateOrderDetailReq implements Serializable {
     /**
      * 生产日期
      */
-    private Date productionDate;
+    private String productionDate;
 
     /**
      * 质保期

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

@@ -173,6 +173,7 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
     private String api;
 
     //是否打印
-    private Integer isPrint;
+    private String isPrint;
+
 }
 

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

@@ -17,14 +17,14 @@ import javax.annotation.Resource;
 @RestController
 @Slf4j
 @RequestMapping("/OrderCommon")
-@Api(tags = "审核流单子拒绝模块")
+@Api(tags = "业务通用模块")
 public class OrderCommonController {
     //单子拒绝之后，需要修改当前单子的审批状态，修改为已驳回
     @Resource
     private OrderCommonService orderCommonService;
     @ApiOperation("审核不通过，修改单子状态")
     @PostMapping("/changeOrderExamineState")
-    public ApiRes<Boolean> changeOrderExamineState(HandleDataDTO handleDataDTO){
+    public ApiRes<Boolean> changeOrderExamineState(@RequestBody HandleDataDTO handleDataDTO){
         return ApiRes.success(orderCommonService.changeOrderExamineState(handleDataDTO));
     }
 

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

@@ -87,6 +87,8 @@ public class OrderController {
     public ApiRes<Boolean> Accounting(@RequestBody @Validated(ValidationApi.delete.class) UpdateOrderReq req){
         return ApiRes.success(orderMainService.Accounting(req));
     }
+    //记账完成之后往消息队列推送消息表示该单子已经完成结算
+
 
     @PostMapping("/ShowAccountingPage")
     @ApiOperation("查看记账列表")

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

@@ -32,12 +32,9 @@ import java.util.List;
 @Api(tags = "出入库模块")
 public class OutAndInboundController {
 
-
     @Resource
     public LogSummaryService logSummaryService;
 
-
-
     @Resource
     private LogDetailService logDetailService;
 

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

@@ -114,19 +114,19 @@ public class Inventory implements Serializable {
     /**
      * 生产日期
      */
-    @TableField("production_date")
+    @TableField(value = "production_date",fill = FieldFill.INSERT_UPDATE)
     private Date productionDate;
 
     /**
      * 质保期
      */
-    @TableField("warranty_period")
+    @TableField(value = "warranty_period", fill = FieldFill.INSERT_UPDATE)
     private Integer warrantyPeriod;
 
     /**
      * 维保期
      */
-    @TableField("maintenance_period")
+    @TableField(value = "maintenance_period", fill = FieldFill.INSERT_UPDATE)
     private Integer maintenancePeriod;
 
     /**

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

@@ -2,6 +2,7 @@ package com.junmp.jyzb.listener;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
@@ -51,6 +52,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.beans.Transient;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -134,6 +136,10 @@ import static com.junmp.junmpProcess.common.CommonConstants.*;
                         List<UpdateOrderDetailReq> collect = list.stream().map(orderDetail -> {
                             UpdateOrderDetailReq updateOrderDetailReq = new UpdateOrderDetailReq();
                             BeanPlusUtil.copyProperties(orderDetail, updateOrderDetailReq);
+                            if (ObjectUtil.isNotNull(orderDetail.getProductionDate())){
+                                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                                updateOrderDetailReq.setProductionDate(format.format(orderDetail.getProductionDate()));
+                            }
                             return updateOrderDetailReq;
                         }).collect(Collectors.toList());
                         updateOrderReq.setDetailList(collect);
@@ -172,7 +178,7 @@ import static com.junmp.junmpProcess.common.CommonConstants.*;
                     sendReq.setReceiveUserIds(String.valueOf(user.getUserId()));
                     sendReq.setMsgTitle("您的审批已通过");
                     sendReq.setBizType("pass/"+Types);
-
+                    sendReq.setBizId(Long.valueOf(processInstanceId));
                     sendReq.setMsgContent("您提交的审批【"+mainProcess.getName()+"】已经通过");
                     sendReq.setPriority("0");
                     sendReq.setSendTime(DateTime.now());

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

@@ -48,7 +48,7 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
                                              @Param("name") String name, @Param("policeCode")String policeCode,
                                              @Param("state")Integer state,
                                              @Param("phone")String phone,@Param("flag") String flag,
-                                             @Param("pageNo")long pageNo, @Param("pageSize") Long pageSize,
+                                             @Param("pageNo")Long pageNo, @Param("pageSize") Long pageSize,
                                              @Param("column") String column,@Param("order") String order);
 
     long count(@Param("orgId") Long orgId, @Param("account")String account,

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

@@ -24,20 +24,14 @@ public class OutInLogsReceiver {
 
         try {
             System.out.println("msg = " + msg);
+            // 手动确认消息
+            channel.basicAck(deliveryTag, false);
             OutInLogsReq req = JSON.parseObject(msg, OutInLogsReq.class);
-
             //将消息进行消费
             Boolean result = logSummaryService.processInventoryRecords(req);
-            if (result){
-                // 手动确认消息
-                channel.basicAck(deliveryTag, false);
-            }else {
-                channel.basicNack(deliveryTag, false, true);
-            }
-            // 手动确认消息
-//            channel.basicAck(deliveryTag, false);
+
         } catch (Exception e) {
-            // 处理消息过程中发生异常，拒绝消息并将其重新放回队列
+            // 处理消息过程中发生异常，拒绝消息并将其重新放回队列ms
             try {
                 channel.basicNack(deliveryTag, false, true);
             } catch (IOException ex) {

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

@@ -100,24 +100,23 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
 
             busForm1 = this.getById(req.getId());
         }
-        if (busForm1==null) {
-            //判断是否有工作流id，如果有则将状态进行修改
-            if (ObjectUtil.isEmpty(req.getProcessDefinitionId()))
-            {
-                req.setExamineState("none");
-            }
-            else
-            {
-                req.setExamineState("working");
-            }
-        }
-        else {
+        if (busForm1!=null) {
             //判断该单据是否可以进行修改(如果审核中则不允许修改)\
             if (ObjectUtil.isNotNull(busForm1.getExamineState()) && busForm1.getExamineState().equals("working")){
                 throw new ServiceException(OrderExceptionEnum.ORDER_CAN_NOT_UPDATE);
             }
         }
 
+        if (ObjectUtil.isEmpty(req.getProcessDefinitionId()))
+        {
+            req.setExamineState("none");
+        }
+        else
+        {
+            req.setExamineState("working");
+        }
+
+
         BusForm busForm = new BusForm();
         BeanUtil.copyProperties(req,busForm);
         //设置业务单的使用次数（默认是出库一次，入库一次）
@@ -175,6 +174,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
                     break;
                 case "remove":
                     startProcessInstanceDTO.setStartOrgName(req.getOrgName());
+                    startProcessInstanceDTO.setEndOrgName(req.getOrgName());
                     break;
             }
             //装备列表

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

@@ -24,6 +24,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -99,12 +101,15 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
             one.setPrice(order.getPrice());
             one.setActualQuantity(order.getActualQuantity());
             one.setOrderState(one.getOrderState());
+            one.setOrderState("finished");
+            one.setUpdateTime(DateTimeUtil.getCurrentDateTime());
             a=orderMainService.updateById(one);
             List<OrderDetail> collect = orderDetailList.stream().map(detailOrderReq -> {
                 OrderDetail orderDetail = new OrderDetail();
                 BeanPlusUtil.copyProperties(detailOrderReq, orderDetail);
                 //记账数量默认时识别数量
                 orderDetail.setModifyQuantity(detailOrderReq.getActualNum());
+                orderDetail.setUpdateTime(DateTimeUtil.getCurrentDateTime());
                 return orderDetail;
             }).collect(Collectors.toList());
             b=orderDetailService.updateBatchById(collect);
@@ -112,9 +117,26 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
             //2.判断业务类型,如果是采购，更新装备库存表
             if (order.getBussinessType().equals("purchase")){
                 List<PurchaseEqsReq> purchaseList = order.getPurchaseList();
-                List<Inventory> collect1 = purchaseList.stream().map(purchaseEqsReq -> {
+                List<Inventory> collect1=new ArrayList<>();
+                for (PurchaseEqsReq eqsReq:purchaseList) {
                     Inventory inventory = new Inventory();
-                    BeanPlusUtil.copyProperties(purchaseEqsReq, inventory);
+                    if (ObjectUtil.isNotNull(eqsReq.getProductionDate()) && !eqsReq.getProductionDate().trim().isEmpty()){
+                        try {
+                            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                            inventory.setProductionDate(format.parse(eqsReq.getProductionDate()));
+                        } catch (ParseException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }
+                    inventory.setEpc(eqsReq.getEpc());
+                    inventory.setTypeId(eqsReq.getTypeId());
+                    inventory.setSizeId(eqsReq.getSizeId());
+                    inventory.setMaintenancePeriod(eqsReq.getMaintenancePeriod());
+                    inventory.setWarrantyPeriod(eqsReq.getWarranyPeriod());
+                    inventory.setLocationId(eqsReq.getLocationId());
+                    inventory.setSupplierId(eqsReq.getSupplierId());
+                    inventory.setPrice(eqsReq.getPrice());
+//                    BeanPlusUtil.copyProperties(eqsReq, inventory);
                     inventory.setId(UUID.randomUUID().toString());
                     inventory.setCreateTime(DateTimeUtil.getCurrentDateTime());
                     inventory.setState("normal");
@@ -122,8 +144,8 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
                     inventory.setBussinessState("normal");
                     inventory.setLocationType(0);
                     inventory.setOrgId(order.getOrgId());
-                    return inventory;
-                }).collect(Collectors.toList());
+                    collect1.add(inventory);
+                }
 
                 c=inventoryService.saveBatch(collect1);
             }
@@ -211,7 +233,7 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
         if (inventoryList.size()>0){
             LambdaUpdateWrapper<Inventory> updateStateWrapper = Wrappers.lambdaUpdate();
             for (Inventory inventory:inventoryList) {
-                updateStateWrapper.or().eq(Inventory::getId,inventory.getId())
+                updateStateWrapper.or().eq(Inventory::getEpc,inventory.getEpc())
                         .set(Inventory::getLocationState,inventory.getLocationState())
                         .set(Inventory::getBussinessState,inventory.getBussinessState())
                         .set(Inventory::getState,inventory.getState());

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

@@ -350,7 +350,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         Policeman one = PoliceExist(req.getId());
         IStoredEncryptApi storedEncryptApi = (IStoredEncryptApi) SpringUtil.getBean(IStoredEncryptApi.class);
         //如果不为空则表示修改警员密码
-        if (ObjectUtil.isNotEmpty(req.getPassword()) || !req.getPassword().trim().isEmpty()) {
+        if (req.getPassword()!=null && !req.getPassword().trim().isEmpty()) {
             String newPassword = storedEncryptApi.encrypt(req.getPassword());
             req.setPassword(newPassword);
             //修改警员密码的同时修改账号表中的密码
@@ -493,9 +493,11 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             req.setPageSize(10L);
         }
         long size=policemanMapper.count(req.getOrgId(),req.getAccount(),req.getName(),req.getPoliceCode(),req.getState(),req.getPhone(),req.getFlag());
+        System.out.println("req = " + (req.getPageNo()-1));
+        System.out.println("req = " + req.getPageSize());
         List<PolicemanDto> policemanDtos = policemanMapper.selectUserBypoliceIds
                 (req.getOrgId(),req.getAccount(),req.getName(),req.getPoliceCode(),
-                        req.getState(),req.getPhone(),req.getFlag(),(req.getPageNo()-1),req.getPageSize(),req.getColumn(),req.getOrder());
+                        req.getState(),req.getPhone(),req.getFlag(),(req.getPageNo()-1)*req.getPageSize(),req.getPageSize(),req.getColumn(),req.getOrder());
        //判断是否需要添加空数据
         if(req.getIsCreateNullDate()==null || req.getIsCreateNullDate()){
             Class<PolicemanDto> policemanDto = PolicemanDto.class;
@@ -630,12 +632,14 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
                 .eq(OrderLog::getOrgId, req.getOrgId())
                 .eq(OrderLog::getOrderType, policeman.getName() + policeman.getPoliceCode())
                 .orderByDesc(OrderLog::getCreateTime));
-        List<PoliceEquipment> policeEqsList = policeEquipmentService.list(new LambdaQueryWrapper<PoliceEquipment>()
-                .eq(PoliceEquipment::getPoliceId, policeman.getId()));
-        String locationId = policeEqsList.get(0).getLocationId();
+        List<PoliceEquipment> policeEqsList=new ArrayList<>();
+        String locationId="";
         OrderLog orderLog=new OrderLog();
         if (list.size()>0){
              orderLog= list.get(0);
+            policeEqsList= policeEquipmentService.list(new LambdaQueryWrapper<PoliceEquipment>()
+                    .eq(PoliceEquipment::getPoliceId, policeman.getId()));
+            locationId = policeEqsList.get(0).getLocationId();
         }
         List<Object[]> searchItem=new ArrayList<>();
         //判断调岗警员是否已经绑定了箱门
@@ -669,7 +673,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
 
                 //调岗警员绑定第一个单警柜以后，不管之后他是否还有单警柜，我都默认是不绑了。
                 // 判断他下面是否有箱门，如果有则表示他已经帮过单警柜并且调岗携带的装备都已经记录过，那么将不再被记录
-                if (boxReq.getContainType()==1 && ObjectUtil.isNotNull(orderLog) && list1.size()==0 && !flag && ObjectUtil.isNotNull(locationId)){
+                if (boxReq.getContainType()==1 && ObjectUtil.isNotNull(orderLog) && list1.size()==0 && !flag && !locationId.trim().isEmpty()){
                     flag=true;
                     cabinet = cabinetService.getById(boxReq.getCabinetId());
                     for (PoliceEquipment equipment:policeEqsList) {
@@ -1029,19 +1033,19 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         if (ObjectUtil.isNotNull(req.getId()) && !req.getId().trim().isEmpty()){
             reassignment1 = reassignmentService.getById(req.getId());
         }
-        if (reassignment1==null){
-            //判断是否有工作流id，如果有则将状态进行修改
-            if (ObjectUtil.isEmpty(req.getProcessDefinitionId())) {
-                req.setExamineState("none");
-            } else {
-                req.setExamineState("working");
-            }
-        }else {
+        if (reassignment1!=null){
+
             //判断该单据是否可以进行修改(如果审核中则不允许修改)\
             if (ObjectUtil.isNotNull(reassignment1.getExamineState()) && reassignment1.getExamineState().equals("working")){
                 throw new ServiceException(OrderExceptionEnum.ORDER_CAN_NOT_UPDATE);
             }
         }
+        //判断是否有工作流id，如果有则将状态进行修改
+        if (ObjectUtil.isEmpty(req.getProcessDefinitionId())) {
+            req.setExamineState("none");
+        } else {
+            req.setExamineState("working");
+        }
 
         Reassignment reassignment = new Reassignment();
         BeanPlusUtil.copyProperties(req,reassignment);
@@ -1183,6 +1187,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         boolean a=true;
         boolean flag=false;
         Policeman one = getById(req.getId());
+
         if (one.getFaceInfo()!=null && !one.getFaceInfo().isEmpty()){
             flag=true;
             if(req.getFaceInfoList().size()>0 && !req.getFaceInfoList().get(0).equals(one.getFaceInfo())){

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

@@ -18,6 +18,7 @@ public class RabbitMQSendMsg {
     private RabbitAdmin rabbitAdmin;
     public  void SendMsg(String exchangeName,String name,Object msg)
     {
+        //exchangeName交换机名称，name组织机构名称，msg发送的消息
         Queue queue=new Queue(name,true,false,false);
         Exchange exchange = new DirectExchange(exchangeName, true, false);
         rabbitAdmin.declareQueue(queue);

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

@@ -280,9 +280,7 @@ WHERE o.org_id IN
         <if test="column != null and column != '' and order != null and order != '' ">
             order by ${column} ${order}
         </if>
-        <if test="pageNo!=null and pageNo!='' and pageSize!=null and pageSize!=''">
-            limit #{pageNo},#{pageSize}
-        </if>
+        limit #{pageNo},#{pageSize}
 
 
     </select>

jyzb-process/src/main/java/com/junmp/junmpProcess/common/CommonConstants.java

@@ -20,6 +20,7 @@ public interface CommonConstants {
     String INVLIST="invList";//装备列表拼接
     String BUSSINESS_TYPE="bussinessType"; //单据业务类型
     String OUT_IN_STATE="outInState";//出入库单据状态（出库还是入库）
+    String PROCESS_ID="processId";
 
 
     String BUSINESS_STATUS_1="正在处理"; //正在处理

jyzb-process/src/main/java/com/junmp/junmpProcess/dto/ApplyDTO.java

@@ -31,5 +31,6 @@ public class ApplyDTO extends PageDTO {
     //是否创建空数据，true则创建，false则不创建
     private Boolean isCreateNullDate;
 
+    private String processId;
 
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/dto/TaskDTO.java

@@ -33,4 +33,6 @@ public class TaskDTO extends PageDTO {
 
     //是否创建空数据，true则创建，false则不创建
     private Boolean isCreateNullDate;
+
+    private String processId;
 }

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

@@ -180,11 +180,13 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
                 .variables(processVariables != null ? processVariables : Collections.emptyMap())
                 .businessStatus(BUSINESS_STATUS_1)
                 .start();
+
+        processVariables.put(PROCESS_ID,processInstance.getProcessInstanceId());
         // 从流程执行上下文中获取流程变量
         Object skip = runtimeService.getVariable(processInstance.getId(), "skip");
 
         if (ObjectUtils.isNotEmpty(skip) && BooleanUtils.toBoolean(skip.toString())){
-            return "skip"+processInstance.getId();
+            return "skip"+processInstance.getProcessInstanceId();
         }
         else{
 
@@ -194,6 +196,7 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
 
         }
 
+
 //        } catch (Exception e) {
 //            String fullErrorMessage = getFullErrorMessage(e);
 //            // 处理在启动流程实例时发生的异常

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

@@ -48,4 +48,6 @@ public class HistoryProcessInstanceVO {
     private String outInState;
     @ApiModelProperty("单据内容")
     private String formData;
+    @ApiModelProperty("流程id")
+    private String processId;
 }

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

@@ -51,5 +51,7 @@ public class TaskVO {
     private String businessType;
     @ApiModelProperty("出入库状态")
     private String outInState;
+    @ApiModelProperty("流程id")
+    private String processId;
 
 }