1.增加单据删除功能接口

2.扫码单据类，扫码单据详情类，业务单据类，业务单据详情类，编码类，库存详情类增加删除标识字段，查询更新方法增加删除标识条件

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

@@ -292,6 +292,51 @@ public class StockOrderController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    /**
+     * 单据删除页面查询单据列表
+     *
+     * @param stockOrderFilterRequest
+     * @return
+     */
+    @GetMapping("/udiwms/stock/order/filterOrderForDelete")
+    public BaseResponse filterOrderForDelete(StockOrderFilterRequest stockOrderFilterRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        List<StockOrderEntity> stockOrderEntityList;
+
+        if (StringUtils.isNotBlank(stockOrderFilterRequest.getCorpId())) {
+            CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(stockOrderFilterRequest.getCorpId()));
+            if (companyEntity.getUnitIdFk().equals("110")) {
+                Integer userId = customerService.getUserId();
+                stockOrderFilterRequest.setUnitIdFk(null);
+                stockOrderFilterRequest.setUserId(customerService.getUserId());
+                InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderFilterRequest.getLocStorageCode());
+                FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest();
+                filterInvUserRequest.setCode(invWarehouseEntity.getCode());
+                filterInvUserRequest.setUserid(userId.longValue());
+                filterInvUserRequest.setIsDirector(true);
+                List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest);
+                if (CollUtil.isEmpty(warehouseUserEntities)) {
+                    stockOrderFilterRequest.setUnionUser(userId);
+                }
+            } else
+                stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk());
+            stockOrderFilterRequest.setCorpId(null);
+        }
+
+        stockOrderEntityList = stockOrderService.filterListOr(stockOrderFilterRequest);
+        PageInfo<StockOrderEntity> pageInfo;
+        pageInfo = new PageInfo<>(stockOrderEntityList);
+
+        //判断订单是否可以补单
+        List<StockOrderResponse> resultList = orderService.checkSupplementOrder(stockOrderEntityList);
+        PageSimpleResponse<StockOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(resultList);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/stock/order/filterDetail")
     public BaseResponse filterDetail(StockOrderFilterRequest stockOrderFilterRequest,
@@ -374,6 +419,21 @@ public class StockOrderController {
         return ResultVOUtils.success();
     }
 
+    /**
+     * 删除单据
+     *
+     * @param id
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/stock/order/deleteOrder")
+    public BaseResponse deleteOrder(@RequestParam("id") String id) {
+        if (StrUtil.isBlank(id)) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        return stockOrderService.deleteOrder(id);
+    }
+
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/stock/order/update")
     public BaseResponse submitStockOrder(@RequestBody StockOrderEntity stockOrderEntity) {

api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java

@@ -304,7 +304,6 @@ public class InvProductsController {
         }
         List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(udiInfoBean.getUuid());
         FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
-//        String code = null;
         if (udiInfoEntities != null && udiInfoEntities.size() > 1) {
             filterInvProductDetailRequest.setProductIdFk(udiInfoBean.getId() + "");
             filterInvProductDetailRequest.setBatchNo(udiEntity.getBatchNo());
@@ -337,7 +336,6 @@ public class InvProductsController {
             return ResultVOUtils.error(500, "未查询到数据！");
         }
 
-
     }
 
     /**

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

@@ -46,4 +46,5 @@ public interface CodesDao {
     boolean updateSupId(@Param("supId") String supId, @Param("nameCode") String nameCode, @Param("orderId") String orderId);
 
 
+    void updateDelFlag(@Param("orderId") String orderId, @Param("delFlag") boolean delFlag);
 }

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

@@ -53,4 +53,5 @@ public interface OrderDao {
 
     List<OrderEntity> findAllByTime(OrderFilterRequest orderFilterRequest);
 
+    void updateDelFlag(@Param("id") String id, @Param("delFlag") boolean delFlag);
 }

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

@@ -43,4 +43,6 @@ public interface OrderDetailDao {
     ErpOrderEntity findById(@Param("id") String id);
 
     boolean deleteByOrderId(@Param("id") String id);
+
+    void updateDelFlag(@Param("orderIdFk") String orderIdFk, @Param("delFlag") boolean delFlag);
 }

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

@@ -41,4 +41,13 @@ public interface StockOrderDao {
      */
     List<StockOrderEntity> selectSupplementOrderList();
 
+    /**
+     * 根据ID查询单据
+     *
+     * @param id
+     * @return
+     */
+    StockOrderEntity selectById(@Param("id") String id);
+
+    void updateDelFlag(@Param("id") String id, @Param("delFlag") boolean delFlag);
 }

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

@@ -1,6 +1,5 @@
 package com.glxp.sale.admin.dao.inout;
 
-import com.glxp.sale.admin.entity.inout.OrderEntity;
 import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity;
 import com.glxp.sale.admin.req.inout.StockOrderDetailFilterRequest;
 import com.glxp.sale.admin.res.inout.StockOrderDetailResponse;
@@ -27,4 +26,6 @@ public interface StockOrderDetailDao {
     boolean deleteByOrderIdFk(@Param("id") String id);
 
     StockOrderDetailEntity findOne(@Param("id") String id);
+
+    void updateDelFlag(@Param("orderIdFk") String orderIdFk, @Param("delFlag") boolean delFlag);
 }

api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvProductDetailDao.java

@@ -30,4 +30,5 @@ public interface InvProductDetailDao {
 
     InvProductDetailEntity isExit(FilterInvProductDetailRequest filterInvProductDetailRequest);
 
+    void updateDelFlag(@Param("orderIdFk") String orderIdFk, @Param("delFlag") boolean delFlag);
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/ErpOrderEntity.java

@@ -77,5 +77,7 @@ public class ErpOrderEntity {
 
     private String bindRlFk;
 
+    //是否删除
+    private boolean delFlag;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderDetailEntity.java

@@ -1,34 +0,0 @@
-package com.glxp.sale.admin.entity.inout;
-
-import lombok.Data;
-
-@Data
-public class OrderDetailEntity {
-
-    private String id;
-    private String nameCode;
-    private String packRatio;
-    private String packLevel;
-    private int bhxjsl;
-    private int bhzxxsbzsl;
-
-    private String bhxjcpbm;
-    private String bzcj;
-    private String thirdProductNo;
-    private String addType;
-    private String deviceRecordKey;
-    private String type;
-    private String unit;
-    private String coName;
-    private String form;
-    private String formSpec;
-    private String packSpec;
-    private String authCode;
-    private String name;
-    private String uuid;
-    private int count;
-    private int zxxsbzbhsydysl;
-    private int isUseDy;
-
-
-}

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java

@@ -49,4 +49,7 @@ public class OrderEntity {
     private Date updateTime;
     private boolean preCheck;
 
+    //是否删除
+    private boolean delFlag;
+
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderDetailEntity.java

@@ -37,4 +37,7 @@ public class StockOrderDetailEntity {
     private String manufactory;
     private boolean allowNoBatch;
 
+    //是否删除
+    private boolean delFlag;
+
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java

@@ -35,4 +35,7 @@ public class StockOrderEntity {
     private Integer createUser;
     private Integer reviewUser;
 
+    //是否删除
+    private boolean delFlag;
+
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseEntity.java

@@ -35,6 +35,9 @@ public class WarehouseEntity {
 
     private String mySupId;
 
+    //是否删除
+    private boolean delFlag;
+
     public String getSupId() {
 
         if (supId == null) {

api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductDetailEntity.java

@@ -26,4 +26,7 @@ public class InvProductDetailEntity {
     private String invStorageCode;
     private String invWarehouseCode;
 
+    //是否删除
+    private boolean delFlag;
+
 }

api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductDetailRequest.java

@@ -24,6 +24,7 @@ public class FilterInvProductDetailRequest extends ListPageRequest {
     private String stockIdFk;
     private String supId;
     private String originCode;
+    private String orderIdFk;
 
 
     private String invStorageCode;

api-admin/src/main/java/com/glxp/sale/admin/res/inout/DlOrderResponse.java

@@ -1,7 +1,6 @@
 package com.glxp.sale.admin.res.inout;
 
 import com.glxp.sale.admin.entity.inout.ErpOrderEntity;
-import com.glxp.sale.admin.entity.inout.OrderDetailEntity;
 import com.glxp.sale.admin.entity.inout.OrderEntity;
 import com.glxp.sale.admin.entity.inout.WarehouseEntity;
 import lombok.Data;

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

@@ -4,6 +4,7 @@ import com.glxp.sale.admin.entity.inout.StockOrderEntity;
 import com.glxp.sale.admin.entity.inout.StockOrderPrintEntity;
 import com.glxp.sale.admin.req.inout.StockOrderFilterRequest;
 import com.glxp.sale.admin.req.inout.StockOrderQueryRequest;
+import com.glxp.sale.common.res.BaseResponse;
 
 import java.util.List;
 
@@ -43,4 +44,12 @@ public interface StockOrderService {
      */
     List<StockOrderEntity> getSupplementOrderBillNoList();
 
+    /**
+     * 删除订单
+     *
+     * @param id
+     * @return
+     */
+    BaseResponse deleteOrder(String id);
+
 }

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

@@ -1,23 +1,48 @@
 package com.glxp.sale.admin.service.inout.impl;
 
 import com.github.pagehelper.PageHelper;
-import com.glxp.sale.admin.dao.inout.StockOrderDao;
+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.StockOrderEntity;
 import com.glxp.sale.admin.entity.inout.StockOrderPrintEntity;
+import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity;
+import com.glxp.sale.admin.entity.inventory.InvProductEntity;
 import com.glxp.sale.admin.req.inout.StockOrderFilterRequest;
 import com.glxp.sale.admin.req.inout.StockOrderQueryRequest;
+import com.glxp.sale.admin.req.inventory.FilterInvProductDetailRequest;
+import com.glxp.sale.admin.req.inventory.FilterInvProductRequest;
 import com.glxp.sale.admin.service.inout.StockOrderService;
+import com.glxp.sale.common.res.BaseResponse;
+import com.glxp.sale.common.util.ResultVOUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class StockOrderServiceImpl implements StockOrderService {
 
     @Resource
     StockOrderDao stockOrderDao;
+    @Resource
+    private InvProductDetailDao invProductDetailDao;
+    @Resource
+    private InvProductDao invProductDao;
+    @Resource
+    private StockOrderDetailDao stockOrderDetailDao;
+    @Resource
+    private OrderDao orderDao;
+    @Resource
+    private OrderDetailDao orderDetailDao;
+    @Resource
+    private CodesDao codesDao;
 
     @Override
     public List<StockOrderEntity> listStockOrders(StockOrderQueryRequest stockOrderQueryRequest) {
@@ -112,4 +137,52 @@ public class StockOrderServiceImpl implements StockOrderService {
         return stockOrderDao.selectSupplementOrderList();
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public BaseResponse deleteOrder(String id) {
+        //查询业务单据数据
+        StockOrderEntity stockOrderEntity = stockOrderDao.selectById(id);
+        //查询库存详情
+        FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
+        filterInvProductDetailRequest.setOrderIdFk(stockOrderEntity.getOrderIdFk());
+        List<InvProductDetailEntity> invProductDetailEntities = invProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
+        Map<String, List<InvProductDetailEntity>> map = invProductDetailEntities.stream().collect(Collectors.groupingBy(InvProductDetailEntity::getProductIdFk));
+
+        List<InvProductEntity> invProductEntities = new ArrayList<>(map.keySet().size());
+        for (String key : map.keySet()) {
+            //查询库存
+            FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest();
+            filterInvProductRequest.setRelIdFk(key);
+            List<InvProductEntity> invProductEntityList = invProductDao.filterInvProduct(filterInvProductRequest);
+            InvProductEntity invProductEntity = invProductEntityList.get(0);
+
+            List<InvProductDetailEntity> list = map.get(key);
+            String mainAction = list.get(0).getMainAction();
+            int count = list.stream().mapToInt(InvProductDetailEntity::getCount).sum();
+            if (mainAction.equals(ConstantType.TYPE_OUT)) {
+                //出库，删除单据，库存做增加
+                int result = invProductEntity.getOutCount() + count;
+                invProductEntity.setOutCount(result);
+            } else if (mainAction.equals(ConstantType.TYPE_PUT)) {
+                //入库,删除单据，库存做扣减
+                int result = invProductEntity.getInCount() - count;
+                invProductEntity.setInCount(result);
+            }
+
+            invProductEntities.add(invProductEntity);
+        }
+
+        //更新单据状态和库存数据
+        stockOrderDao.updateDelFlag(stockOrderEntity.getId(), true);
+        stockOrderDetailDao.updateDelFlag(stockOrderEntity.getId(), true);
+        orderDao.updateDelFlag(stockOrderEntity.getOrderIdFk(), true);
+        orderDetailDao.updateDelFlag(stockOrderEntity.getOrderIdFk(), true);
+        codesDao.updateDelFlag(stockOrderEntity.getOrderIdFk(), true);
+        for (InvProductEntity invProductEntity : invProductEntities) {
+            invProductDao.updateInvProduct(invProductEntity);
+        }
+        invProductDetailDao.updateDelFlag(stockOrderEntity.getOrderIdFk(), true);
+        return ResultVOUtils.success("删除成功");
+    }
+
 }

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

@@ -15,6 +15,7 @@
         SELECT *
         FROM io_codes
         <where>
+            delFlag = 0
             <if test="corpOrderId != '' and corpOrderId!=null">
                 and orderId = #{corpOrderId}
             </if>
@@ -33,7 +34,6 @@
             <if test="relId != '' and relId!=null">
                 and relId =#{relId}
             </if>
-
         </where>
         ORDER BY actDate
     </select>
@@ -100,20 +100,21 @@
         FROM io_codes
         WHERE `code` = #{code}
           AND 'action' <![CDATA[ <> ]]> 'StockCheck'
+          AND delFlag = 0
     </select>
     <select id="findByReceiptId" parameterType="Map" resultType="com.glxp.sale.admin.entity.inout.WarehouseEntity">
         SELECT *
         FROM io_codes
         WHERE `orderId` = #{orderId}
           AND 'action' <![CDATA[ <> ]]> 'StockCheck'
+          and delFlag = 0
     </select>
     <select id="searchCode" parameterType="Map" resultType="com.glxp.sale.admin.entity.inout.WarehouseEntity">
         SELECT *
         FROM io_codes
-        WHERE SUBSTRING(`code`, 1, 14) = #{code}
+        WHERE delFlag = 0 and (SUBSTRING(`code`, 1, 14) = #{code}
            or SUBSTRING(`code`, 2, 14) = #{code}
-           or SUBSTRING(`code`, 3, 14) = #{code}
+           or SUBSTRING(`code`, 3, 14) = #{code})
-
     </select>
 
     <select id="findCodesById" parameterType="Map"
@@ -121,11 +122,13 @@
         SELECT code
         FROM io_codes
         WHERE `orderId` = #{orderId}
+        and delFlag = 0
     </select>
     <select id="getByCorpOrderId" resultType="com.glxp.sale.admin.entity.inout.WarehouseEntity">
         select *
         from io_codes
         where corpOrderId = #{corpOrderId}
+        and delFlag = 0
     </select>
     <update id="updateOrderId" parameterType="Map">
         UPDATE io_codes
@@ -174,9 +177,15 @@
             <if test="invStorageCode != null">invStorageCode=#{invStorageCode},</if>
             <if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
             <if test="locStorageCode != null">locStorageCode=#{locStorageCode},</if>
-
+            <if test="delFlag != null">delFlag=#{delFlag},</if>
         </trim>
         WHERE id=#{id}
     </update>
 
+    <update id="updateDelFlag">
+        update io_codes
+        set delFlag = #{delFlag}
+        where orderId = #{orderId}
+    </update>
+
 </mapper>

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

@@ -8,6 +8,7 @@
         SELECT *
         FROM io_order
         where status = 'success'
+        and delFlag = false
     </select>
 
     <select id="listOrderError" parameterType="com.glxp.sale.admin.req.inout.OrderQueryRequest"
@@ -16,8 +17,8 @@
         select *
         from io_order
         where `status`  <![CDATA[ <> ]]> 'success'
+        and delFlag = false
         ORDER BY actDate DESC
-
     </select>
 
     <select id="listOrderRepeat" parameterType="com.glxp.sale.admin.req.inout.OrderQueryRequest"
@@ -26,6 +27,7 @@
         select *
         from io_order
         where corpOrderId in (select corpOrderId from io_order group by corpOrderId HAVING COUNT(corpOrderId) > 1)
+        and delFlag = false
         ORDER BY actDate DESC
     </select>
 
@@ -34,7 +36,7 @@
                              fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
                              receiveStatus, erpFk, stockCheckFk, customerId, supId,
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
-                             outChangeEnable, originUllageSupNo,preCheck)
+                             outChangeEnable, originUllageSupNo,preCheck,delFlag)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -52,8 +54,9 @@
                 #{receiveStatus},
                 #{erpFk},
                 #{stockCheckFk},
-                #{customerId}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo}
+                #{customerId}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo},
-                   , #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo},#{preCheck})
+                #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo},#{preCheck}
+                   #{delFlag})
     </insert>
 
 
@@ -63,7 +66,7 @@
                              fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
                              receiveStatus, erpFk, stockCheckFk, customerId, supId,
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
-                             outChangeEnable, originUllageSupNo,preCheck)
+                             outChangeEnable, originUllageSupNo,preCheck, delFlag)
         values (
         #{id},
         #{action},
@@ -91,7 +94,9 @@
         #{createUser},
         #{reviewUser},
         #{outChangeEnable},
-        #{originUllageSupNo},#{preCheck}
+        #{originUllageSupNo},
+        #{preCheck},
+        #{delFlag}
         )
     </insert>
 
@@ -128,17 +133,10 @@
             <if test="outChangeEnable != null">outChangeEnable=#{outChangeEnable},</if>
             <if test="originUllageSupNo != null">originUllageSupNo=#{originUllageSupNo},</if>
             <if test="preCheck != null">preCheck=#{preCheck},</if>
-
+            <if test="delFlag != null">delFlag=#{delFlag},</if>
         </trim>
         WHERE id = #{id}
     </update>
-    <select id="listOrderByIds" resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
-        select * from io_order where id in
-        <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
-            #{item}
-        </foreach>
-    </select>
-
 
     <delete id="deleteById" parameterType="Map">
         DELETE
@@ -146,7 +144,6 @@
         WHERE id = #{id}
     </delete>
 
-
     <delete id="deleteByOrderId" parameterType="Map">
         DELETE
         FROM io_order
@@ -190,6 +187,7 @@
         SELECT io_order.* FROM io_order
         INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
         <where>
+             io_order.delFlag = false
             <if test="id != '' and id!=null">
                 and io_order.id =#{id}
             </if>
@@ -270,6 +268,7 @@
         SELECT io_order.* FROM io_order
         INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
         <where>
+            io_order.delFlag = false
             <if test="id != '' and id!=null">
                 and io_order.id =#{id}
             </if>
@@ -344,6 +343,7 @@
         SELECT io_order.* FROM io_order
         INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
         <where>
+            io_order.delFlag = false
             <if test="id != '' and id!=null">
                 and io_order.id =#{id}
             </if>
@@ -414,6 +414,7 @@
         SELECT io_order.* FROM io_order
         INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
         <where>
+            io_order.delFlag = false
             <if test="id != '' and id!=null">
                 and io_order.id =#{id}
             </if>
@@ -476,6 +477,7 @@
             resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
         SELECT * FROM io_order
         <where>
+            io_order.delFlag = false
             <if test="id != '' and id!=null">
                 and id =#{id}
             </if>
@@ -505,7 +507,7 @@
             resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
         SELECT * FROM io_order
         <where>
-
+            io_order.delFlag = false
             <if test="status != '' and status!=null">
                 and status = #{status}
             </if>
@@ -513,7 +515,7 @@
                 and receiveStatus = #{receiveStatus}
             </if>
             <if test="lastUpdateTime!=null and lastUpdateTime!=''">
-                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                and   <![CDATA[    DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
             <if test="filterActions!=null">
                 and `action` in
@@ -531,6 +533,7 @@
         <foreach collection="warehouseEntityList" item="item" open="(" separator="," close=")">
             #{item.orderId}
         </foreach>
+        and delFlag = false
     </select>
 
     <select id="filterListByOrder" parameterType="java.util.List"
@@ -539,7 +542,14 @@
         <foreach collection="orderList" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
+        and delFlag = false
     </select>
 
+    <update id="updateDelFlag">
+        update io_order
+        set delFlag = #{delFlag}
+        where id = #{id}
+    </update>
+
 
 </mapper>

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

@@ -8,6 +8,7 @@
         select io_order_detail.* ,basic_corp.name supName from io_order_detail
         left join basic_corp on io_order_detail.supId = basic_corp.erpId
         <where>
+            io_order_detail.delFlag = false
             <if test="erpOrderId != '' and erpOrderId!=null">
                 and io_order_detail.erpOrderId = #{erpOrderId}
             </if>
@@ -26,17 +27,18 @@
 
     <select id="findByStockCheck" parameterType="java.util.List"
             resultType="com.glxp.sale.admin.entity.inout.ErpOrderEntity">
-
         select * from io_order_detail where orderIdFk in
         <foreach item="item" index="index" collection="orderids" open="(" separator="," close=")">
             #{item}
         </foreach>
+        and delFlag = false
     </select>
 
     <select id="filterMyErpMainOrder" parameterType="com.glxp.sale.admin.entity.inout.FilterErpOrderRequest"
             resultType="com.glxp.sale.admin.entity.inout.ErpOrderEntity">
         select * from io_order_detail
         <where>
+            delFlag = false
             <if test="erpOrderId != '' and erpOrderId!=null">
                 and erpOrderId = #{erpOrderId}
             </if>
@@ -52,6 +54,7 @@
             resultType="com.glxp.sale.admin.entity.inout.ErpOrderEntity">
         select * from io_order_detail
         <where>
+            delFlag = false
             <if test="erpOrderId != '' and erpOrderId!=null">
                 and erpOrderId = #{erpOrderId}
             </if>
@@ -72,7 +75,7 @@
         <foreach item="item" index="index" collection="docids" open="(" separator="," close=")">
             #{item}
         </foreach>
-
+        and delFlag = false
     </select>
     <select id="selectAllIds" parameterType="java.util.List"
             resultType="java.lang.String">
@@ -83,6 +86,7 @@
             #{item}
         </foreach>
         )
+        and delFlag = false
         GROUP BY erpOrderId
     </select>
 
@@ -90,6 +94,7 @@
             resultType="java.lang.String">
         select erpOrderId from io_order_detail
         <where>
+            delFlag = false
             <if test="orderId != '' and orderId!=null">
                 and orderIdFk = #{orderId}
             </if>
@@ -101,11 +106,10 @@
             resultType="com.glxp.sale.admin.entity.inout.ErpOrderEntity">
         select erpOrderId,orderIdFk from io_order_detail
         <where>
-
+            delFlag = false
             <if test="orderId != '' and orderId!=null">
                 and orderIdFk <![CDATA[ <> ]]> #{orderId}
             </if>
-
         </where>
         group by erpOrderId
     </select>
@@ -118,7 +122,7 @@
       batchNo,erpCount,credate,nameCode,productCompany,
       coName,authCode,packSpec,packRatio,bhzxxsbzsl,
       zxxsbzbhsydysl,orderIdFk,`count`,reCount,productDate,expireDate,bindStatus,bindRlFk,uuidFk,supId,bindSupStatus
-        ,ylqxzcrbarmc,secSalesListNo,firstSalesInvNo,secSalesInvNo,invoiceDate,price)
+        ,ylqxzcrbarmc,secSalesListNo,firstSalesInvNo,secSalesInvNo,invoiceDate,price,delFlag)
         values(
         #{id},
         #{companyid},
@@ -157,7 +161,8 @@
         #{firstSalesInvNo},
         #{secSalesInvNo},
         #{invoiceDate},
-        #{price}
+        #{price},
+        #{delFlag}
         )
     </insert>
 
@@ -166,7 +171,7 @@
         companyid,erpOrderId,iodtlId,inoutId,goodsunit,goodsid,batchNoId,goodsname,companyname,
         batchNo,erpCount,credate,nameCode,productCompany,
         coName,authCode,packSpec,packRatio,bhzxxsbzsl,zxxsbzbhsydysl,orderIdFk,count,reCount,productDate,expireDate
-        ,bindStatus,bindRlFk,uuidFk,supId,bindSupStatus,ylqxzcrbarmc,secSalesListNo,firstSalesInvNo,secSalesInvNo,invoiceDate,price)
+        ,bindStatus,bindRlFk,uuidFk,supId,bindSupStatus,ylqxzcrbarmc,secSalesListNo,firstSalesInvNo,secSalesInvNo,invoiceDate,price,delFlag)
         values
         <foreach collection="erpOrderEntities" item="item" index="index"
                  separator=",">
@@ -193,7 +198,7 @@
             #{item.secSalesListNo},
             #{item.firstSalesInvNo},
             #{item.secSalesInvNo},
-            #{item.invoiceDate},#{item.price}
+            #{item.invoiceDate},#{item.price}, #{item.delFlag}
             )
         </foreach>
 
@@ -221,6 +226,7 @@
             <if test="invoiceDate != null">invoiceDate=#{invoiceDate},</if>
             <if test="productCompany != null">productCompany=#{productCompany},</if>
             <if test="bindSupStatus != null">bindSupStatus=#{bindSupStatus},</if>
+            <if test="delFlag != null">delFlag=#{delFlag},</if>
         </trim>
         WHERE id = #{id}
     </update>
@@ -248,4 +254,11 @@
         FROM io_order_detail
         WHERE `id` = #{id}
     </select>
+
+    <update id="updateDelFlag">
+        update io_order_detail
+        set delFlag = #{delFlag}
+        where orderIdFk = #{orderIdFk}
+    </update>
+
 </mapper>

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

@@ -8,7 +8,7 @@
         SELECT *
         FROM stock_order
                  INNER JOIN inv_warehouse_user on stock_order.locStorageCode = inv_warehouse_user.`code`
-        where status = 'success'
+        where status = 'success' and delFlag = false
         group by stock_order.id
     </select>
 
@@ -18,7 +18,7 @@
         select *
         from stock_order
                  INNER JOIN inv_warehouse_user on stock_order.locStorageCode = inv_warehouse_user.`code`
-        where `status` = '101'
+        where `status` = '101' and stock_order.delFlag = false
         group by stock_order.id
         ORDER BY id DESC
 
@@ -29,7 +29,7 @@
         insert INTO stock_order(id, billNo, billdate, corpId, corpName, billType, billFlag,
                                 thirdSysFk, status, statusInfo, type, sourceType,
                                 printStatus, unitIdFk, customerId, thirdOrderFk, orderIdFk,
-                                totalPrice, locStorageCode, supplementNo, createUser, reviewUser)
+                                totalPrice, locStorageCode, supplementNo, createUser, reviewUser, delFlag)
         values (#{id},
                 #{billNo},
                 #{billdate},
@@ -43,7 +43,7 @@
                 #{type},
                 #{sourceType},
                 #{printStatus}, #{unitIdFk}, #{customerId}, #{thirdOrderFk}, #{orderIdFk}, #{totalPrice},
-                #{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser})
+                #{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser}, #{delFlag})
     </insert>
     <update id="updateById" parameterType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
         UPDATE stock_order
@@ -69,6 +69,7 @@
             <if test="supplementNo != null">supplementNo=#{supplementNo},</if>
             <if test="createUser != null">createUser=#{createUser},</if>
             <if test="reviewUser != null">reviewUser=#{reviewUser},</if>
+            <if test="delFlag != null">delFlag=#{delFlag},</if>
         </trim>
         WHERE id = #{id}
     </update>
@@ -100,6 +101,7 @@
         SELECT stock_order.* FROM stock_order
         INNER JOIN inv_warehouse_user on stock_order.locStorageCode = inv_warehouse_user.`code`
         <where>
+            stock_order.delFlag = false
             <if test="id != '' and id!=null">
                 and id =#{id}
             </if>
@@ -185,6 +187,7 @@
             resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
         SELECT * FROM stock_order
         <where>
+            delFlag = false
             <if test="id != '' and id!=null">
                 and id =#{id}
             </if>
@@ -229,7 +232,7 @@
         stock_order_detail.orderIdFk
         left join inv_warehouse on inv_warehouse.code = stock_order.locStorageCode
         <where>
-
+               stock_order.delFlag = false
             <if test="id != '' and id!=null">
                 and stock_order.id =#{id}
             </if>
@@ -249,7 +252,21 @@
     <select id="selectSupplementOrderList" resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
         select *
         from stock_order
-        where supplementNo is null
+        where delFlag = false
-           or supplementNo = ''
+          and (supplementNo is null
+                or supplementNo = '')
+    </select>
+
+    <select id="selectById" resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
+        select *
+        from stock_order
+        where id = #{id}
     </select>
+
+    <update id="updateDelFlag">
+        update stock_order
+        set delFlag = #{delFlag}
+        where id = #{id}
+    </update>
+
 </mapper>

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

@@ -8,6 +8,7 @@
         select stock_order_detail.*,basic_udirel.allowNoBatch from stock_order_detail
         left join basic_udirel on stock_order_detail.relId = basic_udirel.id
         <where>
+            delFlag = false
             <if test="orderIdFk != '' and orderIdFk!=null">
                 and orderIdFk = #{orderIdFk}
             </if>
@@ -40,6 +41,7 @@
         right JOIN basic_products
         ON stock_order_detail.productId = basic_products.uuid
         <where>
+            stock_order_detail.delFlag = false
             <if test="orderIdFk != '' and orderIdFk!=null">
                 and orderIdFk = #{orderIdFk}
             </if>
@@ -66,7 +68,7 @@
         INTO stock_order_detail(id,
         orderIdFk,productId,productName,spec,batchNo,productDate,
         expireDate,count,reCount,sweepCount,ylqxzcrbarmc,zczbhhzbapzbh,price,relId,
-        manufactory,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate)
+        manufactory,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate,delFlag)
         values(
         #{id},
         #{orderIdFk},
@@ -87,7 +89,8 @@
         #{firstSalesInvNo},
         #{secSalesInvNo},
         #{secSalesListNo},
-        #{invoiceDate}
+        #{invoiceDate},
+        #{delFlag}
         )
     </insert>
 
@@ -96,7 +99,7 @@
         replace INTO stock_order_detail(id,
         orderIdFk,productId,productName,spec,batchNo,productDate,
         expireDate,count,reCount,sweepCount,ylqxzcrbarmc,zczbhhzbapzbh,price,relId,
-        manufactory,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate)
+        manufactory,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate,delFlag)
         values
         <foreach collection="stockOrderDetailEntities" item="item" index="index"
                  separator=",">
@@ -114,7 +117,7 @@
             #{item.sweepCount},
             #{item.ylqxzcrbarmc},
             #{item.zczbhhzbapzbh},#{item.price},#{item.relId},#{item.manufactory},#{item.firstSalesInvNo},#{item.secSalesInvNo},
-            #{item.secSalesListNo},#{item.invoiceDate}
+            #{item.secSalesListNo},#{item.invoiceDate},#{item.delFlag}
             )
         </foreach>
 
@@ -136,6 +139,7 @@
             <if test="invoiceDate != null">invoiceDate=#{invoiceDate},</if>
             <if test="relId != null">relId=#{relId},</if>
             <if test="manufactory != null">manufactory=#{manufactory},</if>
+            <if test="delFlag != null">delFlag=#{delFlag},</if>
         </set>
         WHERE id = #{id}
     </update>
@@ -156,7 +160,15 @@
             resultType="com.glxp.sale.admin.entity.inout.StockOrderDetailEntity">
         SELECT *
         FROM stock_order_detail
-        WHERE id = #{id} limit 1
+        WHERE id = #{id}
+        and delFlag = false
+        limit 1
     </select>
 
+    <update id="updateDelFlag">
+        update stock_order_detail
+        set delFlag = #{delFlag}
+        where orderIdFk = #{orderIdFk}
+    </update>
+
 </mapper>

api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml

@@ -102,10 +102,7 @@
     <select id="selectExit" parameterType="Map"
             resultType="com.glxp.sale.admin.entity.inventory.InvProductEntity">
         SELECT *
-        FROM inv_product
+        FROM inv_product where relIdFk = #{relIdFk}
-        <where>
-            relIdFk = #{relIdFk}
-        </where>
         limit 1
     </select>
 

api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml

@@ -5,8 +5,10 @@
 
     <select id="filterInvProductDetail" parameterType="com.glxp.sale.admin.req.inventory.FilterInvProductDetailRequest"
             resultType="com.glxp.sale.admin.entity.inventory.InvProductDetailEntity">
-        SELECT * FROM inv_product_detail
+        SELECT *
+        FROM inv_product_detail
         <where>
+            delFlag = false
             <if test="productIdFk != '' and productIdFk != null">
                 AND productIdFk = #{productIdFk}
             </if>
@@ -51,14 +53,18 @@
             <if test="invWarehouseCode != '' and invWarehouseCode != null">
                 AND invWarehouseCode = #{invWarehouseCode}
             </if>
+            <if test="orderIdFk != null and orderIdFk != ''">
+                AND orderIdFk = #{orderIdFk}
+            </if>
         </where>
-
     </select>
+
     <select id="filterJoinInvProduct" parameterType="com.glxp.sale.admin.req.inventory.FilterInvProductDetailRequest"
             resultType="com.glxp.sale.admin.res.inventory.InvProductDetailJoinResponse">
         SELECT inv_product_detail.* ,io_order.fromCorp,io_order.fromCorpId FROM inv_product_detail
         inner join io_order on inv_product_detail.orderIdFk = io_order.id
         <where>
+            inv_product_detail.delFlag = false
             <if test="productIdFk != '' and productIdFk != null">
                 AND productIdFk = #{productIdFk}
             </if>
@@ -105,42 +111,41 @@
                 AND invWarehouseCode = #{invWarehouseCode}
             </if>
         </where>
-
     </select>
+
     <insert id="insertInvProductDetail" keyProperty="id"
             parameterType="com.glxp.sale.admin.entity.inventory.InvProductDetailEntity">
         insert INTO inv_product_detail
                 (code, productIdFk, orderIdFk, customerId, mainAction, `action`, `count`, updateTime,
-         purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId, originCode, invStorageCode,
+                 purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId, originCode,
-         invWarehouseCode)
+                 invStorageCode,
+                 invWarehouseCode, delFlag)
         values (#{code},
                 #{productIdFk}, #{orderIdFk},
                 #{customerId}, #{mainAction}, #{action}, #{count}, #{updateTime},
                 #{purchaseType}, #{batchNo}, #{productionDate}, #{expireDate}, #{unitFk}, #{stockIdFk}, #{supId},
-                #{originCode}, #{invStorageCode}, #{invWarehouseCode})
+                #{originCode}, #{invStorageCode}, #{invWarehouseCode}, #{delFlag})
-
     </insert>
 
     <insert id="insertInvProductDetails" keyProperty="id"
             parameterType="com.glxp.sale.admin.entity.inventory.InvProductDetailEntity">
         insert INTO inv_product_detail
                 (code, productIdFk, orderIdFk, customerId, mainAction, `action`, `count`, updateTime,
-        purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId,originCode, invStorageCode,
+                 purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId, originCode,
-        invWarehouseCode)
+                 invStorageCode,
+                 invWarehouseCode, delFlag)
                 values
 
         <foreach collection="invProductDetailEntitys" item="item" index="index"
                  separator=",">
-            (
+            (#{item.code},
-            #{item.code},
              #{item.productIdFk}, #{item.orderIdFk},
              #{item.customerId}, #{item.mainAction}, #{item.action}, #{item.count}, #{item.updateTime},
              #{item.purchaseType}, #{item.batchNo}, #{item.productionDate}, #{item.expireDate},
-            #{item.unitFk},#{item.stockIdFk}
+             #{item.unitFk}, #{item.stockIdFk},
-            ,#{item.supId},#{item.originCode},#{item.invStorageCode},#{item.invWarehouseCode}
+             #{item.supId}, #{item.originCode}, #{item.invStorageCode}, #{item.invWarehouseCode},
-            )
+             #{item.delFlag})
         </foreach>
-
     </insert>
 
 
@@ -190,6 +195,7 @@
             <if test="originCode != null">originCode=#{originCode},</if>
             <if test="invStorageCode != null">invStorageCode=#{invStorageCode},</if>
             <if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
+            <if test="delFlag != null">delFlag=#{delFlag},</if>
         </trim>
         WHERE id = #{id}
     </update>
@@ -197,6 +203,7 @@
             resultType="java.lang.Integer">
         SELECT count(0) FROM inv_product_detail
         <where>
+            delFlag = false
             <if test="productIdFk != '' and productIdFk != null">
                 AND productIdFk = #{productIdFk}
             </if>
@@ -246,6 +253,7 @@
             resultType="com.glxp.sale.admin.entity.inventory.InvProductDetailEntity">
         SELECT * FROM inv_product_detail
         <where>
+            delFlag = false
             <if test="productIdFk != '' and productIdFk != null">
                 AND productIdFk = #{productIdFk}
             </if>
@@ -283,4 +291,11 @@
         limit 1
 
     </select>
+
+    <update id="updateDelFlag">
+        update inv_product_detail
+        set delFlag = #{delFlag}
+        where orderIdFk = #{orderIdFk}
+    </update>
+
 </mapper>