2/19 扫码剔除1.0

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -143,6 +143,9 @@ public class IoCodeTempController extends BaseController {
     @Resource
     SysOrderLedService sysOrderLedService;
 
+    @Autowired
+    IoSplitFifoCodeService ioSplitFifoCodeService;
+
 
     /**
      * PDA-----单据上传
@@ -1652,6 +1655,7 @@ public class IoCodeTempController extends BaseController {
             codeEnttity.setProductType(2);
             codeEnttity.setCount(1);
             codeEnttity.setGroupNumber(groupNumber);
+            codeEnttity.setQueueCode(addOrderRequest.getWorkPlaceQueueCode());
 
 
             //如果是阿里拉的单据会有批次号
@@ -3135,4 +3139,82 @@ public class IoCodeTempController extends BaseController {
     }
 
 
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/warehouse/inout/deleteCode")
+    public BaseResponse deleteCode(@RequestBody FilterCodeRequest filterCodeRequest){
+        // 已经做过校验了 所以 要上药队列  还是库存队列 的码 然后进行扣减库存 删码
+        IoCodeTempEntity ioCodeTemp = codeTempService.selectOone(filterCodeRequest);
+        if (ioCodeTemp != null){
+            codeTempService.removeCodeById(ioCodeTemp);
+            return ResultVOUtils.success(processUdiAndReturnSuccess(filterCodeRequest));
+        }
+        IoSplitFifoCodeEntity ioSplitFifoCode = ioSplitFifoCodeService.selectOne(filterCodeRequest);
+        if (ioSplitFifoCode != null){
+            ArrayList<String> codes = new ArrayList<>();
+            codes.add(ioSplitFifoCode.getCode());
+            ioSplitFifoInvService.removeByCodes(codes,filterCodeRequest.getWorkPlaceCode());
+            return ResultVOUtils.success(processUdiAndReturnSuccess(filterCodeRequest));
+        }
+        //判断是上位队列 还是 库存
+        return ResultVOUtils.error(500,"追溯码不存在");
+    }
+
+    public AddEnterCodeResponse processUdiAndReturnSuccess(FilterCodeRequest filterCodeRequest){
+        UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeRequest.getCode());
+        UdiRelevanceResponse checkUdi = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
+        udiEntity.setCode(filterCodeRequest.getCode());
+        return setAddEnterCodeResponse(udiEntity, checkUdi);
+    }
+
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/warehouse/inout/deleteCodes")
+    public BaseResponse deleteCodes(@RequestBody FilterCodeRequest filterCodeRequest){
+        List<String> codeList = filterCodeRequest.getCodeList();
+        AddCodeResult addCodeResult = new AddCodeResult();
+        List<VailCodeResultResponse> vailCodeResultResponses = new ArrayList<>();
+        for (String code : codeList) {
+            VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse();
+            filterCodeRequest.setCode(code);
+            IoCodeTempEntity ioCodeTemp = codeTempService.selectOone(filterCodeRequest);
+            if (ioCodeTemp != null){
+                codeTempService.removeCodeById(ioCodeTemp);
+                vailCodeResultResponse.setCode(code);
+                vailCodeResultResponse.setStatus(1);
+                vailCodeResultResponse.setErrMsg("正确");
+                vailCodeResultResponses.add(vailCodeResultResponse);
+                continue;
+            }
+            IoSplitFifoCodeEntity ioSplitFifoCode = ioSplitFifoCodeService.selectOne(filterCodeRequest);
+            if (ioSplitFifoCode != null){
+                ArrayList<String> codes = new ArrayList<>();
+                codes.add(ioSplitFifoCode.getCode());
+                ioSplitFifoInvService.removeByCodes(codes,filterCodeRequest.getWorkPlaceCode());
+                vailCodeResultResponse.setCode(code);
+                vailCodeResultResponse.setStatus(1);
+                vailCodeResultResponse.setErrMsg("正确");
+                vailCodeResultResponses.add(vailCodeResultResponse);
+                continue;
+            }
+            vailCodeResultResponse.setCode(code);
+            vailCodeResultResponse.setStatus(2);
+            vailCodeResultResponse.setErrMsg("追溯码不存在");
+            vailCodeResultResponses.add(vailCodeResultResponse);
+        }
+        addCodeResult.setVailCodeResultResponses(vailCodeResultResponses);
+        return ResultVOUtils.success(addCodeResult);
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/warehouse/inout/fallback")
+    public BaseResponse fallback(@RequestBody FilterCodeRequest filterCodeRequest){
+        List<IoCodeTempEntity> codeList = codeTempService.selectListByGroupNumber(filterCodeRequest.getGroupNumber());
+        for (IoCodeTempEntity codeTempEntity : codeList) {
+            codeTempService.removeCodeById(codeTempEntity);
+        }
+        return ResultVOUtils.success();
+    }
+
+
+
 }

src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java

@@ -234,4 +234,10 @@ public class IoCodeTempEntity {
      */
     @TableField(value = "groupNumber")
     private Integer groupNumber;
+
+    /**
+     *  槽位编码
+     */
+    @TableField(value = "queueCode")
+    private String queueCode;
 }

src/main/java/com/glxp/api/req/inout/AddOrderRequest.java

@@ -62,4 +62,5 @@ public class AddOrderRequest {
      * 上货货位编码
      */
     private String workPlaceQueueCode;
+
 }

src/main/java/com/glxp/api/req/inout/FilterCodeRequest.java

@@ -86,4 +86,15 @@ public class FilterCodeRequest extends ListPageRequest {
      * 工位库存队列删除
      */
     private Long workPlaceCode;
+
+    /**
+     * 槽位编码
+     */
+    private String queueCode;
+
+    /**
+     * 组号
+     */
+    private Integer groupNumber;
+
 }

src/main/java/com/glxp/api/req/inout/IoSplitFifoCodeRequest.java

@@ -132,4 +132,12 @@ public class IoSplitFifoCodeRequest extends ListPageRequest {
     private String remark;
 
     private Integer fifoSplit;
+
+
+    /**
+     * 槽位
+     */
+    private String workPlaceQueueCode;
+
+
 }

src/main/java/com/glxp/api/service/inout/IoCodeTempService.java

@@ -330,6 +330,20 @@ public class IoCodeTempService {
         return ioCodeTempDao.selectMaxGroupNumber();
     }
 
+    public IoCodeTempEntity selectOone(FilterCodeRequest filterCodeRequest) {
+        return ioCodeTempDao.selectOne(new LambdaQueryWrapper<IoCodeTempEntity>()
+                .eq(IoCodeTempEntity::getCode,filterCodeRequest.getCode())
+                .eq(IoCodeTempEntity::getQueueCode,filterCodeRequest.getQueueCode())
+                        .eq(IoCodeTempEntity::getAction,"SC72197936495755")
+                );
+    }
+
+    public List<IoCodeTempEntity> selectListByGroupNumber(Integer groupNumber) {
+        return ioCodeTempDao.selectList(new LambdaQueryWrapper<IoCodeTempEntity>()
+                .eq(IoCodeTempEntity::getGroupNumber,groupNumber)
+        );
+    }
+
 //    public IoCodeTempResponse convertToIoCodeTempResponse(IoCodeResponse response) {
 //        IoCodeTempResponse tempResponse = new IoCodeTempResponse();
 //        BeanUtils.copyProperties(response,tempResponse);

src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java

@@ -24,6 +24,7 @@ import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.collect.CollectOrderBizRequest;
 import com.glxp.api.req.collect.CollectOrderRequest;
 import com.glxp.api.req.dev.DeviceChangeOrderParam;
+import com.glxp.api.req.inout.FilterCodeRequest;
 import com.glxp.api.req.inout.IoAutoPutRequest;
 import com.glxp.api.req.inout.IoSplitFifoCodeRequest;
 import com.glxp.api.req.inout.IoSplitFifoInvRequest;
@@ -565,4 +566,11 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
         }
         return new ArrayList<>();
     }
+
+    public IoSplitFifoCodeEntity selectOne(FilterCodeRequest filterCodeRequest) {
+        return getOne(new LambdaQueryWrapper<IoSplitFifoCodeEntity>()
+                .eq(IoSplitFifoCodeEntity::getCode, filterCodeRequest.getCode())
+                .eq(IoSplitFifoCodeEntity::getWorkPlaceQueueCode, filterCodeRequest.getQueueCode())
+                .eq(IoSplitFifoCodeEntity::getAction, "SC72197936495755"));
+    }
 }

src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml

@@ -28,8 +28,13 @@
             <if test="action != null and action != ''">
                 AND ic.action = #{action}
             </if>
+            <if test="queueCode != null and queueCode != ''">
+                AND ic.queueCode = #{queueCode}
+            </if>
+
         </where>
         GROUP BY ic.id
+        ORDER BY ic.groupNumber DESC
     </select>
 
     <select id="selectExitCount" resultType="java.lang.Integer">

src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml

@@ -103,6 +103,10 @@
             <if test="workPlaceCode != null">
                 AND workPlaceCode = #{workPlaceCode}
             </if>
+            <if test="workPlaceQueueCode != null">
+                AND workPlaceQueueCode = #{workPlaceQueueCode}
+            </if>
+
         </where>
         group by io_split_fifo_code.id
     </select>

src/main/resources/schemas/schema_v2.4.sql

@@ -5274,3 +5274,9 @@ CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'ycBizNo',
 CALL Pro_Temp_ColumnWork('io_code_temp', 'groupNumber',
                          'int NULL DEFAULT NULL COMMENT ''组号''',
                          1);
+
+
+CALL Pro_Temp_ColumnWork('io_code_temp', 'queueCode',
+                         '  varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''槽位编码''',
+                         1);
+