fix: sop 设备发货管理

sop-api/src/main/java/com/qmth/sop/server/api/TBDeviceInOutController.java

@@ -58,6 +58,7 @@ public class TBDeviceInOutController {
                                            @ApiParam(value = "出入库时间 - 开始") @RequestParam(required = false) Long inOutTimeStart,
                                            @ApiParam(value = "出入库时间 - 结束") @RequestParam(required = false) Long inOutTimeEnd,
                                            @ApiParam(value = "设备编号") @RequestParam(required = false) String deviceNo,
+                                           @ApiParam(value = "设备序列号") @RequestParam(required = false) String deviceSerialNo,
                                            @ApiParam(value = "客户名称") @RequestParam(required = false) String customName,
                                            @ApiParam(value = "当前地") @RequestParam(required = false) String location,
                                            @ApiParam(value = "发往地") @RequestParam(required = false) String address,
@@ -66,7 +67,7 @@ public class TBDeviceInOutController {
                                            @ApiParam(value = "分页容量", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
 
         return ResultUtil.ok(tbDeviceInOutService.findDeviceInOutPageBySop(SystemConstant.convertIdToLong(serviceUnitId),
-                usageType, SystemConstant.convertIdToLong(userId), deviceStatus, inOutTimeStart, inOutTimeEnd, deviceNo, customName, location, address, serialNo,
+                usageType, SystemConstant.convertIdToLong(userId), deviceStatus, inOutTimeStart, inOutTimeEnd, deviceNo, deviceSerialNo, customName, location, address, serialNo,
                 pageNumber, pageSize));
     }
 
@@ -108,6 +109,7 @@ public class TBDeviceInOutController {
                                               @ApiParam(value = "出入库时间 - 开始") @RequestParam(required = false) Long inOutTimeStart,
                                               @ApiParam(value = "出入库时间 - 结束") @RequestParam(required = false) Long inOutTimeEnd,
                                               @ApiParam(value = "设备编号") @RequestParam(required = false) String deviceNo,
+                                              @ApiParam(value = "设备序列号") @RequestParam(required = false) String deviceSerialNo,
                                               @ApiParam(value = "客户名称") @RequestParam(required = false) String customName,
                                               @ApiParam(value = "当前地") @RequestParam(required = false) String location,
                                               @ApiParam(value = "发往地") @RequestParam(required = false) String address,
@@ -116,7 +118,7 @@ public class TBDeviceInOutController {
                                               @ApiParam(value = "分页容量", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
 
         return ResultUtil.ok(tbDeviceInOutService.findDeviceInOutPageBySource(SystemConstant.convertIdToLong(serviceUnitId),
-                usageType, SystemConstant.convertIdToLong(userId), deviceStatus, inOutTimeStart, inOutTimeEnd, deviceNo, customName, location, address, serialNo,
+                usageType, SystemConstant.convertIdToLong(userId), deviceStatus, inOutTimeStart, inOutTimeEnd, deviceNo, deviceSerialNo, customName, location, address, serialNo,
                 pageNumber, pageSize));
     }
 

sop-business/src/main/java/com/qmth/sop/business/mapper/TBDeviceInOutMapper.java

@@ -33,6 +33,7 @@ public interface TBDeviceInOutMapper extends BaseMapper<TBDeviceInOut> {
      * @param inOutTimeStart 出入库时间 - 开始
      * @param inOutTimeEnd   出入库时间 - 结束
      * @param deviceNo       设备编号
+     * @param deviceSerialNo 设备序列号
      * @param customName     客户名称
      * @param location       当前地
      * @param address        发往地
@@ -48,6 +49,7 @@ public interface TBDeviceInOutMapper extends BaseMapper<TBDeviceInOut> {
                                                       @Param("inOutTimeStart") Long inOutTimeStart,
                                                       @Param("inOutTimeEnd") Long inOutTimeEnd,
                                                       @Param("deviceNo") String deviceNo,
+                                                      @Param("deviceSerialNo") String deviceSerialNo,
                                                       @Param("customName") String customName,
                                                       @Param("location") String location,
                                                       @Param("address") String address,
@@ -65,6 +67,7 @@ public interface TBDeviceInOutMapper extends BaseMapper<TBDeviceInOut> {
      * @param inOutTimeStart 出入库时间 - 开始
      * @param inOutTimeEnd   出入库时间 - 结束
      * @param deviceNo       设备编号
+     * @param deviceSerialNo 设备序列号
      * @param customName     客户名称
      * @param location       当前地
      * @param address        发往地
@@ -80,6 +83,7 @@ public interface TBDeviceInOutMapper extends BaseMapper<TBDeviceInOut> {
                                                          @Param("inOutTimeStart") Long inOutTimeStart,
                                                          @Param("inOutTimeEnd") Long inOutTimeEnd,
                                                          @Param("deviceNo") String deviceNo,
+                                                         @Param("deviceSerialNo") String deviceSerialNo,
                                                          @Param("customName") String customName,
                                                          @Param("location") String location,
                                                          @Param("address") String address,

sop-business/src/main/java/com/qmth/sop/business/service/TBDeviceInOutService.java

@@ -31,6 +31,7 @@ public interface TBDeviceInOutService extends IService<TBDeviceInOut> {
      * @param inOutTimeStart 出入库时间 - 开始
      * @param inOutTimeEnd   出入库时间 - 结束
      * @param deviceNo       设备编号
+     * @param deviceSerialNo 设备序列号
      * @param customName     客户名称
      * @param location       当前地
      * @param address        发往地
@@ -41,7 +42,7 @@ public interface TBDeviceInOutService extends IService<TBDeviceInOut> {
      */
     IPage<DeviceInOutResult> findDeviceInOutPageBySop(Long serviceUnitId, DeviceUsageTypeEnum usageType, Long userId,
                                                       DeviceStatusEnum deviceStatus, Long inOutTimeStart, Long inOutTimeEnd,
-                                                      String deviceNo, String customName, String location, String address, String serialNo,
+                                                      String deviceNo, String deviceSerialNo, String customName, String location, String address, String serialNo,
                                                       Integer pageNumber, Integer pageSize);
 
     /**
@@ -82,6 +83,7 @@ public interface TBDeviceInOutService extends IService<TBDeviceInOut> {
      * @param inOutTimeStart 出入库时间 - 开始
      * @param inOutTimeEnd   出入库时间 - 结束
      * @param deviceNo       设备编号
+     * @param deviceSerialNo 设备序列号
      * @param customName     客户名称
      * @param location       当前地
      * @param address        发往地
@@ -92,6 +94,6 @@ public interface TBDeviceInOutService extends IService<TBDeviceInOut> {
      */
     IPage<DeviceInOutResult> findDeviceInOutPageBySource(Long serviceUnitId, DeviceUsageTypeEnum usageType, Long userId,
                                                          DeviceStatusEnum deviceStatus, Long inOutTimeStart, Long inOutTimeEnd,
-                                                         String deviceNo, String customName, String location, String address, String serialNo,
+                                                         String deviceNo, String deviceSerialNo, String customName, String location, String address, String serialNo,
                                                          Integer pageNumber, Integer pageSize);
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDeviceDeliveryServiceImpl.java

@@ -11,10 +11,7 @@ import com.qmth.sop.business.bean.dto.DeviceInfoDto;
 import com.qmth.sop.business.bean.params.DeviceDeliveryParam;
 import com.qmth.sop.business.bean.params.DeviceInOutForm;
 import com.qmth.sop.business.bean.result.TBDeviceDeliveryResult;
-import com.qmth.sop.business.entity.SysDevice;
-import com.qmth.sop.business.entity.SysSupplier;
-import com.qmth.sop.business.entity.SysUser;
-import com.qmth.sop.business.entity.TBDeviceDelivery;
+import com.qmth.sop.business.entity.*;
 import com.qmth.sop.business.mapper.TBDeviceDeliveryMapper;
 import com.qmth.sop.business.service.*;
 import com.qmth.sop.business.util.excel.BasicExcelListener;
@@ -57,7 +54,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
     @Resource
     private SysUserService sysUserService;
     @Resource
-    private BasicAttachmentService basicAttachmentService;
+    private TBCrmService tbCrmService;
 
     @Transactional
     @Override
@@ -76,6 +73,16 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
         }).headRowNumber(2).sheet(0).doRead();
 
         List<DeviceDeliveryImportDto> deviceDeliveryImportDtoList = deviceDeliveryImportDtoLinkedMultiValueMap.get(BasicExcelListener.SUCCESS);
+
+        // 派单序列号集合
+        List<String> crmNoList = tbCrmService.list(new QueryWrapper<TBCrm>()
+                .lambda()
+                .eq(TBCrm::getEnable,true))
+                .stream()
+                .map(TBCrm::getCrmNo)
+                .distinct()
+                .collect(Collectors.toList());
+
         if (CollectionUtils.isNotEmpty(deviceDeliveryImportDtoList)) {
             List<SysSupplier> sysSupplierList = sysSupplierService.list(new QueryWrapper<SysSupplier>().lambda().eq(SysSupplier::getType, SupplierTypeEnum.DEVICE));
             // 供应商map
@@ -135,6 +142,10 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
                     willAddSysDevice.setBound(InOutTypeEnum.IN);
                     willAddSysDevice.setEnable(true);
                     sysDeviceService.save(willAddSysDevice);
+                } else {
+                    if (InOutTypeEnum.OUT.equals(sysDevice.getBound())) {
+                        throw ExceptionResultEnum.ERROR.exception(String.format("序列号为[%s]的设备在设备管理中已存在且状态为'出库',不能导入", sysDevice.getSerialNo()));
+                    }
                 }
 
                 // 查询是否有处于发货过程中设备
@@ -150,6 +161,10 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
 
                 TBDeviceDelivery tbDeviceDelivery = new TBDeviceDelivery();
                 if (crmNo != null && crmNo.length() > 0) {
+                    if (crmNoList.contains(crmNo)){
+                        throw ExceptionResultEnum.ERROR.exception("派单号不存在");
+                    }
+
                     tbDeviceDelivery.setCrmNo(crmNo);
                     tbDeviceDelivery.setUsageType(DeviceUsageTypeEnum.PROJECT);
                 } else {
@@ -342,7 +357,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
                 case DELIVER:
                     // 变更为已发货状态(供应商点击批量发货时触发 UN_DELIVER -> DELIVER(或sop入库新增记录触发))
                     if (tbDeviceDeliveryList.stream().anyMatch(e -> !DeviceDeliveryStatusEnum.UN_DELIVER.equals(e.getStatus()) || !e.getEffect())) {
-                        throw ExceptionResultEnum.ERROR.exception(String.format("只有[出入库过程中]且[%s]的记录才能[%s]", DeviceDeliveryStatusEnum.UN_DELIVER, "发货"));
+                        throw ExceptionResultEnum.ERROR.exception(String.format("只有[出入库过程中]且[%s]的记录才能[%s]", DeviceDeliveryStatusEnum.UN_DELIVER.getTitle(), "发货"));
                     }
                     tbDeviceDeliveryList = tbDeviceDeliveryList.stream().peek(e -> {
                         Long currenTime = System.currentTimeMillis();
@@ -358,7 +373,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
                     // 变更为已签收状态(设备发货列表点击签收触发||sop现场测试签收 -> DELIVER -> RECEIVE)
                     // 入库签收终止该入库记录的生命周期（出库签收不终止,设备发货出库生命周期的终止是在设备出库提交,生成设备发货入库记录时触发）
                     if (tbDeviceDeliveryList.stream().anyMatch(e -> !DeviceDeliveryStatusEnum.DELIVER.equals(e.getStatus()) || !e.getEffect())) {
-                        throw ExceptionResultEnum.ERROR.exception(String.format("只有[出入库过程中]且[%s]的发货记录才能[%s]", DeviceDeliveryStatusEnum.DELIVER, "签收"));
+                        throw ExceptionResultEnum.ERROR.exception(String.format("只有[出入库过程中]且[%s]的发货记录才能[%s]", DeviceDeliveryStatusEnum.DELIVER.getTitle(), "签收"));
                     }
                     tbDeviceDeliveryList = tbDeviceDeliveryList.stream().peek(e -> {
                         Long currenTime = System.currentTimeMillis();
@@ -377,12 +392,13 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
                     // 变更为已作废状态(只有带发货状态能被作废)
                     // 作废触发时该出库生命周期终止
                     if (tbDeviceDeliveryList.stream().anyMatch(e -> !DeviceDeliveryStatusEnum.UN_DELIVER.equals(e.getStatus()) || !e.getEffect())) {
-                        throw ExceptionResultEnum.ERROR.exception(String.format("只有[出入库过程中]且[%s]的发货记录才能[%s]", DeviceDeliveryStatusEnum.UN_DELIVER, "作废"));
+                        throw ExceptionResultEnum.ERROR.exception(String.format("只有[出入库过程中]且[%s]的发货记录才能[%s]", DeviceDeliveryStatusEnum.UN_DELIVER.getTitle(), "作废"));
                     }
                     tbDeviceDeliveryList = tbDeviceDeliveryList.stream().peek(e -> {
                         e.setUpdateId(requestUserId);
                         e.setUpdateTime(System.currentTimeMillis());
                         e.setStatus(DeviceDeliveryStatusEnum.CANCEL);
+                        e.setEnable(false);
                         e.setEffect(false);
                     }).collect(Collectors.toList());
                     this.updateBatchById(tbDeviceDeliveryList);
@@ -416,7 +432,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
 
         String path = e.getExpressPhotoPath();
         if (path != null && path.length() > 0) {
-            e.setExpressPhotoPath(basicAttachmentService.filePreviewPath(path));
+            e.setExpressPhotoPath(path);
         }
     }
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDeviceInOutServiceImpl.java

@@ -52,8 +52,9 @@ public class TBDeviceInOutServiceImpl extends ServiceImpl<TBDeviceInOutMapper, T
     private TBDeviceDeliveryService tbDeviceDeliveryService;
 
     @Override
-    public IPage<DeviceInOutResult> findDeviceInOutPageBySop(Long serviceUnitId, DeviceUsageTypeEnum usageType, Long userId, DeviceStatusEnum deviceStatus, Long inOutTimeStart, Long inOutTimeEnd, String deviceNo, String customName, String location, String address, String serialNo, Integer pageNumber, Integer pageSize) {
+    public IPage<DeviceInOutResult> findDeviceInOutPageBySop(Long serviceUnitId, DeviceUsageTypeEnum usageType, Long userId, DeviceStatusEnum deviceStatus, Long inOutTimeStart, Long inOutTimeEnd, String deviceNo, String deviceSerialNo, String customName, String location, String address, String serialNo, Integer pageNumber, Integer pageSize) {
         deviceNo = SystemConstant.translateSpecificSign(deviceNo);
+        deviceSerialNo = SystemConstant.translateSpecificSign(deviceSerialNo);
         customName = SystemConstant.translateSpecificSign(customName);
         location = SystemConstant.translateSpecificSign(location);
         address = SystemConstant.translateSpecificSign(address);
@@ -62,7 +63,7 @@ public class TBDeviceInOutServiceImpl extends ServiceImpl<TBDeviceInOutMapper, T
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionDto dpr = sysUserService.buildUserDataPermission(requestUser.getId());
         IPage<DeviceInOutResult> result = this.baseMapper.findDeviceInOutPageBySop(new Page<>(pageNumber, pageSize), serviceUnitId, usageType,
-                userId, deviceStatus, inOutTimeStart, inOutTimeEnd, deviceNo, customName, location, address, serialNo, dpr);
+                userId, deviceStatus, inOutTimeStart, inOutTimeEnd, deviceNo, deviceSerialNo, customName, location, address, serialNo, dpr);
         result.getRecords().forEach(e -> {
             String addressArrTemp = e.getAddressArrTemp();
             String locationArrTemp = e.getLocationArrTemp();
@@ -107,7 +108,7 @@ public class TBDeviceInOutServiceImpl extends ServiceImpl<TBDeviceInOutMapper, T
                 }
                 TBDeviceDelivery tbDeviceDelivery = cellDeliveryList.get(0);
                 String deliveryCrmNo = tbDeviceDelivery.getCrmNo();
-                if (!InOutTypeEnum.OUT.equals(tbDeviceDelivery.getDeliveryType()) || !DeviceDeliveryStatusEnum.DELIVER.equals(tbDeviceDelivery.getStatus())){
+                if (!InOutTypeEnum.OUT.equals(tbDeviceDelivery.getDeliveryType()) || !DeviceDeliveryStatusEnum.DELIVER.equals(tbDeviceDelivery.getStatus())) {
                     // 出库 且 已发货的可以出库
                     continue;
                 }
@@ -235,18 +236,19 @@ public class TBDeviceInOutServiceImpl extends ServiceImpl<TBDeviceInOutMapper, T
     }
 
     @Override
-    public IPage<DeviceInOutResult> findDeviceInOutPageBySource(Long serviceUnitId, DeviceUsageTypeEnum usageType, Long userId, DeviceStatusEnum deviceStatus, Long inOutTimeStart, Long inOutTimeEnd, String deviceNo, String customName, String location, String address, String serialNo, Integer pageNumber, Integer pageSize) {
+    public IPage<DeviceInOutResult> findDeviceInOutPageBySource(Long serviceUnitId, DeviceUsageTypeEnum usageType, Long userId, DeviceStatusEnum deviceStatus, Long inOutTimeStart, Long inOutTimeEnd, String deviceNo, String deviceSerialNo, String customName, String location, String address, String serialNo, Integer pageNumber, Integer pageSize) {
         deviceNo = SystemConstant.translateSpecificSign(deviceNo);
         customName = SystemConstant.translateSpecificSign(customName);
         location = SystemConstant.translateSpecificSign(location);
         address = SystemConstant.translateSpecificSign(address);
         serialNo = SystemConstant.translateSpecificSign(serialNo);
+        deviceSerialNo = SystemConstant.translateSpecificSign(deviceSerialNo);
 
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionDto dpr = sysUserService.buildUserDataPermission(requestUser.getId());
 
         IPage<DeviceInOutResult> result = this.baseMapper.findDeviceInOutPageBySource(new Page<>(pageNumber, pageSize), serviceUnitId, usageType,
-                userId, deviceStatus, inOutTimeStart, inOutTimeEnd, deviceNo, customName, location, address, serialNo, dpr);
+                userId, deviceStatus, inOutTimeStart, inOutTimeEnd, deviceNo, deviceSerialNo, customName, location, address, serialNo, dpr);
 
         result.getRecords().forEach(e -> {
             String addressArrTemp = e.getAddressArrTemp();

sop-business/src/main/resources/mapper/TBDeviceDeliveryMapper.xml

@@ -37,17 +37,17 @@
         LEFT JOIN
             sys_user su ON su.id = tbdd.deliver_user_id
         <where>
-            AND tbdd.enable = 1
+            AND tbdd.enable = 1 AND tbdd.status != 'CANCEL'
             <if test="serviceId != null and serviceId != ''">
-                AND tbdd.service_id = #{serviceId}
+                AND tbs.id = #{serviceId}
             </if>
-            <if test="usageType != null and usageType != ''">
+            <if test="usageType != null">
                 AND tbdd.usage_type = #{usageType}
             </if>
             <if test="crmNo != null and crmNo != ''">
-                AND tbdd.crm_no = #{crmNo}
+                AND tbdd.crm_no LIKE CONCAT('%',#{serialNo},'%')
             </if>
-            <if test="status != null and status != ''">
+            <if test="status != null">
                 AND tbdd.status = #{status}
             </if>
             <if test="deliverUserId != null">
@@ -60,10 +60,10 @@
                 AND tbdd.deliver_time <![CDATA[ <= ]]> #{deliverEndTime}
             </if>
             <if test="serialNo != null and serialNo != ''">
-                AND tbdd.serial_no = #{serialNo}
+                AND tbdd.serial_no LIKE CONCAT('%',#{serialNo},'%')
             </if>
             <if test="deviceNo != null and deviceNo != ''">
-                AND sd.device_code = #{deviceNo}
+                AND sd.device_code LIKE CONCAT('%',#{deviceNo},'%')
             </if>
             <if test="supplierId != null">
                 AND tbdd.supplier_id = #{supplierId}
@@ -112,17 +112,17 @@
         LEFT JOIN
             sys_user su ON su.id = tbdd.deliver_user_id
         <where>
-            AND tbdd.enable = 1
+            AND tbdd.enable = 1 AND tbdd.status != 'CANCEL'
             <if test="serviceId != null and serviceId != ''">
-                AND tbdd.service_id = #{serviceId}
+                AND tbs.id = #{serviceId}
             </if>
-            <if test="usageType != null and usageType != ''">
+            <if test="usageType != null">
                 AND tbdd.usage_type = #{usageType}
             </if>
             <if test="crmNo != null and crmNo != ''">
-                AND tbdd.crm_no = #{crmNo}
+                AND tbdd.crm_no LIKE CONCAT('%',#{serialNo},'%')
             </if>
-            <if test="status != null and status != ''">
+            <if test="status != null">
                 AND tbdd.status = #{status}
             </if>
             <if test="deliverUserId != null">
@@ -135,10 +135,10 @@
                 AND tbdd.deliver_time <![CDATA[ <= ]]> #{deliverEndTime}
             </if>
             <if test="serialNo != null and serialNo != ''">
-                AND tbdd.serial_no = #{serialNo}
+                AND tbdd.serial_no LIKE CONCAT('%',#{serialNo},'%')
             </if>
             <if test="deviceNo != null and deviceNo != ''">
-                AND sd.device_code = #{deviceNo}
+                AND sd.device_code LIKE CONCAT('%',#{deviceNo},'%')
             </if>
             <if test="supplierId != null">
                 AND tbdd.supplier_id = #{supplierId}

sop-business/src/main/resources/mapper/TBDeviceInOutMapper.xml

@@ -59,6 +59,9 @@
             <if test="deviceNo != null and deviceNo != ''">
                 AND sd.device_code LIKE CONCAT('%',#{deviceNo},'%')
             </if>
+            <if test="deviceSerialNo != null and deviceSerialNo != ''">
+                AND sd.serial_no LIKE CONCAT('%',#{deviceSerialNo},'%')
+            </if>
             <if test="customName != null and customName != ''">
                 AND tbdio.custom_name LIKE CONCAT('%',#{customName},'%')
             </if>
@@ -153,6 +156,9 @@
             <if test="deviceNo != null and deviceNo != ''">
                 AND sd.device_code LIKE CONCAT('%',#{deviceNo},'%')
             </if>
+            <if test="deviceSerialNo != null and deviceSerialNo != ''">
+                AND sd.serial_no LIKE CONCAT('%',#{deviceSerialNo},'%')
+            </if>
             <if test="customName != null and customName != ''">
                 AND tbdio.custom_name LIKE CONCAT('%',#{customName},'%')
             </if>

sop-business/src/main/resources/mapper/TBServiceMapper.xml

@@ -46,7 +46,7 @@
                 AND tbs.name LIKE CONCAT('%',#{serviceUnitName},'%')
             </if>
         </where>
-        ORDER BY tbs.create_time DESC
+        ORDER BY tbs.update_time DESC
     </select>
 
     <select id="queryServiceUnit" resultType="com.qmth.sop.business.entity.TBService">