fix:

sop 设备入库入该sop出的（不是crm）

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

@@ -47,6 +47,7 @@ public class TBDeviceInOutController {
     private TBDeviceInOutService tbDeviceInOutService;
     @Resource
     private SysUserService sysUserService;
+    // TODO: 2023/11/10 设备出入库sop数据权限变更 
 
     @ApiOperation(value = "sop管理 - 设备出入库登记查询")
     @RequestMapping(value = "/sop_page", method = RequestMethod.POST)
@@ -81,8 +82,8 @@ public class TBDeviceInOutController {
     @RequestMapping(value = "/can_in_info", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = DeviceInOutResult.class)})
     public Result findDeviceCanInInfo(@ApiParam(value = "供应商id") @RequestParam(required = false) String supplierId,
-                                      @ApiParam(value = "派单号") @RequestParam(required = false) String crmNo) {
-        return ResultUtil.ok(tbDeviceInOutService.findDeviceCanInInfo(SystemConstant.convertIdToLong(supplierId), crmNo));
+                                      @ApiParam(value = "派单号") @RequestParam(required = false) String sopNo) {
+        return ResultUtil.ok(tbDeviceInOutService.findDeviceCanInInfo(SystemConstant.convertIdToLong(supplierId), sopNo));
     }
 
     @ApiOperation(value = "设备出入库提交")

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

@@ -104,10 +104,10 @@ public interface TBDeviceInOutMapper extends BaseMapper<TBDeviceInOut> {
      *
      * @param supplierId 供应商id
      * @param inOutType  设备最后一次出入库记录状态 -- 出库
-     * @param crmNo      派单号
+     * @param sopNo      sopNo
      * @return 可入库设备信息
      */
     List<DeviceInOutResult> findDeviceCanInInfo(@Param("supplierId") Long supplierId,
                                                 @Param("inOutType") InOutTypeEnum inOutType,
-                                                @Param("crmNo") String crmNo);
+                                                @Param("sopNo") String sopNo);
 }

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

@@ -56,10 +56,10 @@ public interface TBDeviceInOutService extends IService<TBDeviceInOut> {
      * 查询可入库设备信息
      *
      * @param supplierId 供应商id
-     * @param crmNo      派单号
+     * @param sopNo      sopNo
      * @return 可入库设备信息
      */
-    List<DeviceInOutResult> findDeviceCanInInfo(Long supplierId, String crmNo);
+    List<DeviceInOutResult> findDeviceCanInInfo(Long supplierId, String sopNo);
 
     /**
      * 设备出入库提交

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

@@ -82,8 +82,8 @@ public class TBDeviceInOutServiceImpl extends ServiceImpl<TBDeviceInOutMapper, T
     }
 
     @Override
-    public List<DeviceInOutResult> findDeviceCanInInfo(Long supplierId, String crmNo) {
-        return this.baseMapper.findDeviceCanInInfo(supplierId, InOutTypeEnum.OUT, crmNo).stream().peek(e -> {
+    public List<DeviceInOutResult> findDeviceCanInInfo(Long supplierId, String sopNo) {
+        return this.baseMapper.findDeviceCanInInfo(supplierId, InOutTypeEnum.OUT, sopNo).stream().peek(e -> {
             String locationArrTemp = e.getLocationArrTemp();
             if (locationArrTemp != null && locationArrTemp.length() > 0) {
                 e.setLocationArr(JSON.parseArray(locationArrTemp, String.class));

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

@@ -208,8 +208,8 @@
             <if test="inOutType != null">
                 AND sd.bound = #{inOutType}
             </if>
-            <if test="crmNo != null and crmNo != ''">
-                AND EXISTS(SELECT 1 FROM t_b_device_in_out tbdio WHERE tbdio.device_no = sd.serial_no AND tbdio.crm_no = #{crmNo})
+            <if test="sopNo != null and sopNo != ''">
+                AND EXISTS(SELECT 1 FROM t_b_device_in_out tbdio WHERE tbdio.device_no = sd.serial_no AND tbdio.sop_no = #{sopNo})
             </if>
         </where>
         ORDER BY ss.id,sd.brand,sd.serial_no