确认取药

src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java

@@ -418,11 +418,11 @@ public class IoCollectOrderController extends BaseController {
      */
     @PostMapping("/udiwms/basic/collect/order/bizConfirm")
     @Transactional(rollbackFor = Exception.class)
-    public BaseResponse bizConfirmOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
+    public BaseResponse bizConfirmOrder(@RequestBody IoCollectOrderBiz confirmOrderBiz) {
         /**
          * 取货确认
          */
-        splitCodeService.confirmBizAutiTagCode(collectOrderRequest);
+        splitCodeService.confirmBizAutiTagCode(confirmOrderBiz);
         return ResultVOUtils.success("确认成功！");
     }
 

src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java

@@ -19,6 +19,7 @@ import com.glxp.api.res.inv.InvPreinDetailResponse;
 import com.glxp.api.res.inv.InvPreinOrderResponse;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
+import com.glxp.api.service.inout.IoCodeTempService;
 import com.glxp.api.service.inout.impl.IoCodeService;
 import com.glxp.api.service.inv.InvPreinDetailService;
 import com.glxp.api.service.inv.InvPreinOrderService;

src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java

@@ -159,6 +159,6 @@ public class CollectOrderBizResponse {
 
 
     private boolean splitUnCheck;
-
+    private Boolean getConfirm;
 
 }

src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java

@@ -15,6 +15,7 @@ import com.glxp.api.util.udi.FilterUdiUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Currency;
 import java.util.List;
@@ -129,4 +130,29 @@ public class RelCodeDetailService extends ServiceImpl<RelCodeDetailMapper, RelCo
         }
     }
 
+
+    /**
+     * 获取下级所有码
+     *
+     * @return
+     */
+    public List<RelCodeDetail> getAllNext(String code) {
+        List<RelCodeDetail> list = new ArrayList<>();
+        fetchAllChildren(code, list);
+        return list;
+    }
+
+    private void fetchAllChildren(String code, List<RelCodeDetail> list) {
+        List<RelCodeDetail> relCodeDetails = this.baseMapper.selectList(
+                new LambdaQueryWrapper<RelCodeDetail>().eq(RelCodeDetail::getParentCode, code));
+
+        if (CollUtil.isNotEmpty(relCodeDetails)) {
+            list.addAll(relCodeDetails);
+            for (RelCodeDetail relCodeDetail : relCodeDetails) {
+                fetchAllChildren(relCodeDetail.getCurCode(), list);
+            }
+        }
+    }
+
+
 }

src/main/java/com/glxp/api/service/forthird/impl/ForThirdSysApiService.java

@@ -33,6 +33,7 @@ import com.glxp.api.service.basic.UdiRelevanceService;
 import com.glxp.api.service.basic.UdiRlSupService;
 import com.glxp.api.service.inout.IoAddInoutService;
 import com.glxp.api.service.inout.IoCheckInoutService;
+import com.glxp.api.service.inout.IoCodeTempService;
 import com.glxp.api.service.inout.IoOrderService;
 import com.glxp.api.service.inout.impl.IoCodeService;
 import com.glxp.api.service.inv.impl.InvProductService;

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

@@ -380,14 +380,13 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
     IoCollectOrderService collectOrderService;
 
     @Transactional(rollbackFor = Exception.class)
-    public void confirmBizAutiTagCode(CollectOrderRequest collectOrderRequest) {
+    public void confirmBizAutiTagCode(IoCollectOrderBiz collectOrderBiz) {
 
-        IoCollectOrder collectOrder = collectOrderService.getById(collectOrderRequest.getBillNo());
+        IoCollectOrder collectOrder = collectOrderService.getByBillNo(collectOrderBiz.getOrderIdFk());
         SysWorkplacePutRel sysWorkplacePutRel = workplacePutRelService.findPutWorkPlace(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
         Long putWorkPlaceCode = null;
         if (sysWorkplacePutRel != null)
             putWorkPlaceCode = sysWorkplacePutRel.getWorkPlaceCode();
-        IoCollectOrderBiz collectOrderBiz = collectOrderBizService.getById(collectOrderRequest.getId());
         FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
         filterUdiRelRequest.setId(collectOrderBiz.getRelId());
         filterUdiRelRequest.setPackLevel("1");

src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml

@@ -4,7 +4,7 @@
     <select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderBizRequest"
             resultType="com.glxp.api.res.collect.CollectOrderBizResponse">
         SELECT icob.*,
-               bp.nameCode                   diCode,
+               bp.nameCode diCode,
                bp.zczbhhzbapzbh,
                bp.manufactory,
                bp.bzgg
@@ -35,6 +35,7 @@
             </if>
         </where>
         group by icob.id
+        ORDER BY icob.getConfirm, icob.id desc
     </select>
 
     <update id="updateAutoResCount" parameterType="map">

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

@@ -4669,7 +4669,7 @@ CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'freightCode',
 
 
 CALL Pro_Temp_ColumnWork('io_collect_order_biz', 'getConfirm',
-                         ' tinyint NULL DEFAULT b''1''COMMENT ''取货确认状态''',
+                         ' tinyint NULL DEFAULT b''0''COMMENT ''取货确认状态''',
                          1);