1.修改删除码逻辑为扣减码数量，当码数量为0时扣减库存，删除单据数据

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java

@@ -8,10 +8,8 @@ import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
 import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.controller.inout.utils.DataTransUtil;
-import com.glxp.sale.admin.dao.inout.CodesDao;
 import com.glxp.sale.admin.dao.inout.CodesTempDao;
 import com.glxp.sale.admin.dao.inout.OrderDao;
-import com.glxp.sale.admin.dao.inout.StockOrderDao;
 import com.glxp.sale.admin.dao.inventory.InvWarehouseDao;
 import com.glxp.sale.admin.entity.auth.AuthAdmin;
 import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
@@ -38,7 +36,6 @@ import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
 import com.glxp.sale.common.util.ResultVOUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.regexp.RE;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -703,4 +700,19 @@ public class OrderController {
         return ResultVOUtils.success();
     }
 
+    /**
+     * 根据扫码单据号查询单据信息
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/udiwms/inout/order/getOrderById")
+    public BaseResponse getOrderById(String id) {
+        if (StrUtil.isBlank(id)) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        OrderEntity orderEntity = orderService.findById(id);
+        return ResultVOUtils.success(orderEntity);
+    }
+
 }

api-admin/src/main/java/com/glxp/sale/admin/dao/inout/CodesDao.java

@@ -46,4 +46,11 @@ public interface CodesDao {
     boolean updateSupId(@Param("supId") String supId, @Param("nameCode") String nameCode, @Param("orderId") String orderId);
 
     boolean deleteByOrderIdAndCode(@Param("orderId") String orderId, @Param("code") String code);
+
+    /**
+     * 根据ID删除条码
+     *
+     * @param id
+     */
+    void deleteById(@Param("id") Long id);
 }

api-admin/src/main/java/com/glxp/sale/admin/dao/inout/OrderDetailDao.java

@@ -62,4 +62,12 @@ public interface OrderDetailDao {
      * @return
      */
     int countByOrderId(@Param("orderId") String orderId);
+
+    /**
+     * 查询扫码单据详情
+     *
+     * @param filterErpOrderRequest
+     * @return
+     */
+    List<ErpOrderEntity> filterErpOrder(@Param("filterErpOrderRequest") FilterErpOrderRequest filterErpOrderRequest);
 }

api-admin/src/main/java/com/glxp/sale/admin/dao/inout/StockOrderDao.java

@@ -56,4 +56,12 @@ public interface StockOrderDao {
      * @return
      */
     boolean deleteByOrderIdFk(String orderIdFk);
+
+    /**
+     * 根据扫码单据号，查询业务单据的数据ID（非业务单据号）
+     *
+     * @param orderIdFk
+     * @return
+     */
+    Integer selectIdByOrderIdFk(@Param("orderIdFk") String orderIdFk);
 }

api-admin/src/main/java/com/glxp/sale/admin/dao/inout/StockOrderDetailDao.java

@@ -15,6 +15,8 @@ public interface StockOrderDetailDao {
 
     List<StockOrderDetailResponse> filterStockOrderDetail2(StockOrderDetailFilterRequest stockOrderDetailFilterRequest);
 
+    List<StockOrderDetailEntity> filterStockOrderDetail3(StockOrderDetailFilterRequest stockOrderDetailFilterRequest);
+
     boolean insertStockOrderDetail(StockOrderDetailEntity stockOrderDetailEntity);
 
     boolean insertStockOrderDetails(@Param("stockOrderDetailEntities") List<StockOrderDetailEntity> stockOrderDetailEntitys);

api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesServiceImpl.java

@@ -8,9 +8,7 @@ import com.glxp.sale.admin.constant.ConstantType;
 import com.glxp.sale.admin.dao.inout.*;
 import com.glxp.sale.admin.dao.inventory.InvProductDao;
 import com.glxp.sale.admin.dao.inventory.InvProductDetailDao;
-import com.glxp.sale.admin.entity.inout.FilterErpOrderRequest;
+import com.glxp.sale.admin.entity.inout.*;
-import com.glxp.sale.admin.entity.inout.OrderEntity;
-import com.glxp.sale.admin.entity.inout.WarehouseEntity;
 import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity;
 import com.glxp.sale.admin.entity.inventory.InvProductEntity;
 import com.glxp.sale.admin.req.inout.CodesReplaceRequest;
@@ -177,89 +175,123 @@ public class CodesServiceImpl implements CodesService {
             warehouseQueryRequest.setCode(codesReplaceRequest.getCode());
             List<WarehouseEntity> warehouseEntities = codesDao.findByOrderId(warehouseQueryRequest);
             if (CollUtil.isNotEmpty(warehouseEntities)) {
-                for (WarehouseEntity warehouseEntity : warehouseEntities) {
+                WarehouseEntity warehouseEntity = warehouseEntities.get(0);
-                    //删除码详情
+                if (warehouseEntity.getCount() > 1) {
-                    codesDao.deleteByOrderIdAndCode(warehouseEntity.getOrderId(), warehouseEntity.getCode());
+                    //删除一个条码
-
+                    warehouseEntity.setCount(warehouseEntity.getCount() - 1);
-                    if (order.getStatus().equals(ConstantStatus.ORDER_STATUS_SUCCESS)) {
+                    codesDao.updateCode(warehouseEntity); //更新码详情
-                        //查询库存详情
+                } else {
-                        FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
+                    //如果数量扣减之后为0，直接删除此条码
-                        filterInvProductDetailRequest.setOriginCode(codesReplaceRequest.getCode());
+                    codesDao.deleteById(warehouseEntity.getId());
-                        filterInvProductDetailRequest.setProductIdFk(warehouseEntity.getRelId());
+                }
-                        filterInvProductDetailRequest.setOrderIdFk(order.getId());
+
-                        if (StrUtil.isNotBlank(warehouseEntity.getBatchNo())) {
+                //库存详情扣减1
-                            filterInvProductDetailRequest.setBatchNo(warehouseEntity.getBatchNo());
+                if (order.getStatus().equals(ConstantStatus.ORDER_STATUS_SUCCESS)) {
+                    FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
+                    filterInvProductDetailRequest.setOriginCode(codesReplaceRequest.getCode());
+                    filterInvProductDetailRequest.setProductIdFk(warehouseEntity.getRelId());
+                    filterInvProductDetailRequest.setOrderIdFk(order.getId());
+                    if (StrUtil.isNotBlank(warehouseEntity.getBatchNo())) {
+                        filterInvProductDetailRequest.setBatchNo(warehouseEntity.getBatchNo());
+                    } else {
+                        filterInvProductDetailRequest.setBatchNo("empty");
+                    }
+                    List<InvProductDetailEntity> invProductDetailEntities = invProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
+                    if (CollUtil.isNotEmpty(invProductDetailEntities)) {
+                        //库存详情不为空，单据已验收，扣减库存
+                        InvProductDetailEntity invProductDetailEntity = invProductDetailEntities.get(0);
+                        if (invProductDetailEntity.getCount() > 1) {
+                            invProductDetailEntity.setCount(invProductDetailEntity.getCount() - 1); //更新库存
+                            invProductDetailDao.updateInvProductDetail(invProductDetailEntity);
+                        } else {
+                            //库存详情扣减之后等于0，删除库存详情
+                            invProductDetailDao.deleteByOrderIdAndCode(order.getId(), warehouseEntity.getCode());
+                        }
+
+
+                        //查询原库存详情和新的库存详情
+                        FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest();
+                        filterInvProductRequest.setRelIdFk(invProductDetailEntity.getProductIdFk());
+                        filterInvProductRequest.setSupId(invProductDetailEntity.getSupId());
+                        filterInvProductRequest.setInvStorageCode(invProductDetailEntity.getInvStorageCode());
+                        if (StrUtil.isBlank(invProductDetailEntity.getBatchNo())) {
+                            filterInvProductRequest.setBatchNo("empty");
+                        } else {
+                            filterInvProductRequest.setBatchNo(invProductDetailEntity.getBatchNo());
+                        }
+                        InvProductEntity invProductEntity = invProductDao.filterInvProduct(filterInvProductRequest).get(0);
+                        if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
+                            //入库
+                            invProductEntity.setInCount(invProductEntity.getInCount() - 1);
+                        } else if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
+                            //出库
+                            invProductEntity.setOutCount(invProductEntity.getOutCount() - 1);
+                        }
+
+                        //查询库存码详情，如果库存码详情为空，则删除此库存
+                        FilterInvProductDetailRequest detailParams = new FilterInvProductDetailRequest();
+                        detailParams.setBatchNo(invProductEntity.getBatchNo());
+                        detailParams.setInvCodes(Collections.singletonList(invProductEntity.getInvStorageCode()));
+                        detailParams.setProductIdFk(invProductEntity.getRelIdFk());
+                        int count = invProductDetailDao.statCount(detailParams);
+                        if (count == 0) {
+                            //如果库存码详情为空，则删除此库存
+                            invProductDao.deleteById(String.valueOf(invProductEntity.getId()));
                         } else {
-                            filterInvProductDetailRequest.setBatchNo("empty");
+                            //更新库存
+                            invProductDao.updateInvProduct(invProductEntity);
                         }
-                        List<InvProductDetailEntity> invProductDetailEntities = invProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
+
-                        if (CollUtil.isNotEmpty(invProductDetailEntities)) {
+                        //查询扫码单据详情
-                            //库存详情不为空，单据已验收，更新库存
+                        FilterErpOrderRequest orderDetailRequest = new FilterErpOrderRequest();
-                            InvProductDetailEntity invProductDetailEntity = invProductDetailEntities.get(0); //库存
+                        orderDetailRequest.setOrderIdFk(order.getId());
-
+                        orderDetailRequest.setGoodsid(warehouseEntity.getRelId());
-                            //删除库存详情
+                        orderDetailRequest.setBatchNo(warehouseEntity.getBatchNo());
-                            invProductDetailDao.deleteByOrderIdAndCode(warehouseEntity.getOrderId(), codesReplaceRequest.getCode());
+                        List<ErpOrderEntity> erpOrderEntities = orderDetailDao.filterErpOrder(orderDetailRequest);
-                            //查询原库存详情和新的库存详情
+                        if (CollUtil.isNotEmpty(erpOrderEntities)) {
-                            FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest();
+                            ErpOrderEntity erpOrderEntity = erpOrderEntities.get(0);
-                            filterInvProductRequest.setRelIdFk(invProductDetailEntity.getProductIdFk());
+                            if (erpOrderEntity.getReCount() > 1) {
-                            filterInvProductRequest.setSupId(invProductDetailEntity.getSupId());
+                                erpOrderEntity.setReCount(erpOrderEntity.getReCount() - 1); //应收数量 - 1
-                            filterInvProductRequest.setInvStorageCode(invProductDetailEntity.getInvStorageCode());
+                                erpOrderEntity.setCount(erpOrderEntity.getCount() - 1); //实际数量 - 1
-                            if (StrUtil.isBlank(invProductDetailEntity.getBatchNo())) {
+                                //更新扫码单据详情
-                                filterInvProductRequest.setBatchNo("empty");
+                                orderDetailDao.updateErpOrder(erpOrderEntity);
                             } else {
-                                filterInvProductRequest.setBatchNo(invProductDetailEntity.getBatchNo());
+                                orderDetailDao.deleteByPrimiyId(String.valueOf(erpOrderEntity.getId()));
-                            }
-                            InvProductEntity invProductEntity = invProductDao.filterInvProduct(filterInvProductRequest).get(0);
-
-                            if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
-                                //出库
-                                int count = invProductEntity.getOutCount() - invProductDetailEntity.getCount();
-                                invProductEntity.setOutCount(count);
-                            } else if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
-                                //入库
-                                int count = invProductEntity.getInCount() - invProductDetailEntity.getCount();
-                                invProductEntity.setInCount(count);
                             }
+                        }
 
-                            //查询库存码详情，如果库存码详情为空，则删除此库存
+                        //查询业务单据详情
-                            FilterInvProductDetailRequest detailParams = new FilterInvProductDetailRequest();
+                        StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest();
-                            detailParams.setBatchNo(invProductEntity.getBatchNo());
+                        stockOrderDetailFilterRequest.setProductId(warehouseEntity.getRelId());
-                            detailParams.setInvCodes(Collections.singletonList(invProductEntity.getInvStorageCode()));
+                        stockOrderDetailFilterRequest.setBatchNo(warehouseEntity.getBatchNo());
-                            detailParams.setProductIdFk(invProductEntity.getRelIdFk());
+                        //查询业务单据数据ID
-                            int count = invProductDetailDao.statCount(detailParams);
+                        Integer stockOrderId = stockOrderDao.selectIdByOrderIdFk(order.getId());
-                            if (count == 0) {
+                        stockOrderDetailFilterRequest.setOrderIdFk(String.valueOf(stockOrderId));
-                                //如果库存码详情为空，则删除此库存
+                        List<StockOrderDetailEntity> stockOrderDetailEntities = stockOrderDetailDao.filterStockOrderDetail3(stockOrderDetailFilterRequest);
-                                invProductDao.deleteById(String.valueOf(invProductEntity.getId()));
+                        if (CollUtil.isNotEmpty(stockOrderDetailEntities)) {
+                            StockOrderDetailEntity stockOrderDetailEntity = stockOrderDetailEntities.get(0);
+                            if (Integer.parseInt(stockOrderDetailEntity.getReCount()) > 1) {
+                                stockOrderDetailEntity.setReCount(String.valueOf(Integer.parseInt(stockOrderDetailEntity.getReCount()) - 1)); //实际数量 - 1
+                                stockOrderDetailEntity.setSweepCount(String.valueOf(Integer.parseInt(stockOrderDetailEntity.getSweepCount()) - 1)); //扫码数量 -1
+                                //更新业务单据详情
+                                stockOrderDetailDao.updateById(stockOrderDetailEntity);
                             } else {
-                                //更新库存
+                                //删除业务单据详情
-                                invProductDao.updateInvProduct(invProductEntity);
+                                stockOrderDetailDao.deleteById(stockOrderDetailEntity.getId());
                             }
                         }
-                    }
 
-                    //删除单据详情
+                        //若扫码单据详情已全部被删除，关联删除扫码单据和业务单据
-                    FilterErpOrderRequest deleteOrderDetailParam = new FilterErpOrderRequest();
+                        int orderDetailCount = orderDetailDao.countByOrderId(order.getId());
-                    deleteOrderDetailParam.setOrderIdFk(order.getId());
+                        if (orderDetailCount == 0) {
-                    deleteOrderDetailParam.setGoodsid(warehouseEntity.getRelId());
+                            //当单据详情数量为0时，删除扫码单据和业务单据
-                    deleteOrderDetailParam.setBatchNo(warehouseEntity.getBatchNo());
+                            orderDao.deleteById(order.getId());
-                    orderDetailDao.deleteOrder(deleteOrderDetailParam); //删除扫码单据详情
+                            stockOrderDao.deleteByOrderIdFk(order.getId());
-
+                        }
-                    StockOrderDetailFilterRequest deleteStockOrderDetailParam = new StockOrderDetailFilterRequest();
+                    }
-                    deleteStockOrderDetailParam.setProductId(warehouseEntity.getRelId());
-                    deleteStockOrderDetailParam.setBatchNo(warehouseEntity.getBatchNo());
-                    deleteStockOrderDetailParam.setOrderIdFk(order.getId());
-                    stockOrderDetailDao.deleteStockOrderDetail(deleteStockOrderDetailParam); //删除业务单据详情
-                }
-
-                int orderDetailCount = orderDetailDao.countByOrderId(order.getId());
-                if (orderDetailCount == 0) {
-                    //当单据详情数量为0时，删除扫码单据和业务单据
-                    orderDao.deleteById(order.getId());
-                    stockOrderDao.deleteByOrderIdFk(order.getId());
                 }
             }
         }
-
     }
 
 }

api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml

@@ -183,4 +183,10 @@
           and code = #{code}
     </delete>
 
+    <delete id="deleteById">
+        delete
+        from io_codes
+        where id = #{id}
+    </delete>
+
 </mapper>

api-admin/src/main/resources/mybatis/mapper/inout/OrderDetailDao.xml

@@ -273,5 +273,21 @@
         </where>
     </delete>
 
+    <select id="filterErpOrder" resultType="com.glxp.sale.admin.entity.inout.ErpOrderEntity">
+        select *
+        from io_order_detail
+        <where>
+            <if test="filterErpOrderRequest.orderIdFk != null">
+                AND orderIdFk = #{filterErpOrderRequest.orderIdFk}
+            </if>
+            <if test="filterErpOrderRequest.goodsid != null">
+                AND goodsid = #{filterErpOrderRequest.goodsid}
+            </if>
+            <if test="filterErpOrderRequest.batchNo != null">
+                AND batchNo = #{filterErpOrderRequest.batchNo}
+            </if>
+        </where>
+    </select>
+
 
 </mapper>

api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml

@@ -291,4 +291,10 @@
         where orderIdFk = #{orderIdFk}
     </delete>
 
+    <select id="selectIdByOrderIdFk" resultType="java.lang.Integer">
+        select id
+        from stock_order
+        where orderIdFk = #{orderIdFk}
+    </select>
+
 </mapper>

api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDetail.xml

@@ -129,6 +129,7 @@
             <if test="sweepCount != null">sweepCount=#{sweepCount},</if>
             <if test="count != null">count=#{count},</if>
             <if test="reCount != null">reCount=#{reCount},</if>
+            <if test="sweepCount != null">sweepCount=#{sweepCount},</if>
             <if test="price != null">price=#{price},</if>
             <if test="secSalesListNo != null ">secSalesListNo=#{secSalesListNo},</if>
             <if test="firstSalesInvNo != null">firstSalesInvNo=#{firstSalesInvNo},</if>
@@ -174,4 +175,21 @@
         </where>
     </delete>
 
+    <select id="filterStockOrderDetail3" parameterType="com.glxp.sale.admin.req.inout.StockOrderDetailFilterRequest"
+            resultType="com.glxp.sale.admin.entity.inout.StockOrderDetailEntity">
+        select *
+        from stock_order_detail
+        <where>
+            <if test="productId != null and productId != ''">
+                AND productId = #{productId}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND batchNo = #{batchNo}
+            </if>
+            <if test="orderIdFk != null and orderIdFk != ''">
+                AND orderIdFk = #{orderIdFk}
+            </if>
+        </where>
+    </select>
+
 </mapper>