扫码单据删除，生成库存后单据流转

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

@@ -14,6 +14,7 @@ import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.req.inout.AddOrderRequest;
 import com.glxp.api.req.inout.FilterOrderRequest;
+import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.inout.IoOrderResponse;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
@@ -119,4 +120,16 @@ public class IoOrderController {
     }
 
 
+    //未校验单据删除
+    @AuthRuleAnnotation("")
+    @PostMapping("udiwms/inout/order/delete")
+    public BaseResponse deletById(@RequestBody DeleteRequest deleteRequest) {
+        orderService.deleteByBillNo(deleteRequest.getBillNo());
+        orderDetailBizService.deleteByOrderId(deleteRequest.getBillNo());
+        orderDetailCodeService.deleteByOrderId(deleteRequest.getBillNo());
+        codeTempService.deleteByBillNo(deleteRequest.getBillNo());
+        return ResultVOUtils.success("删除成功！");
+
+    }
+
 }

src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java

@@ -1,6 +1,6 @@
 package com.glxp.api.dao.basic;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.basic.BasicBusTypePreEntity;
 import com.glxp.api.req.basic.FilterBusTypeChangeRequest;
 import com.glxp.api.req.basic.FilterBusTypePreRequest;
@@ -14,9 +14,9 @@ import java.util.List;
  * 补单单据类型查询接口
  */
 @Mapper
-public interface BasicBusTypePreDao extends BaseMapper<BasicBusTypePreEntity> {
+public interface BasicBusTypePreDao extends BaseMapperPlus<BasicBusTypePreDao, BasicBusTypePreEntity, BasicBusTypePreEntity> {
 
-    List<BasicBusTypePreEntity> selectList(FilterBusTypeChangeRequest busTypeChangeFilterRequest);
+    List<BasicBusTypePreEntity> filterList(FilterBusTypeChangeRequest busTypeChangeFilterRequest);
 
     /**
      * 根据单据类型删除

src/main/java/com/glxp/api/entity/inv/InvProductDetailEntity.java

@@ -32,7 +32,7 @@ public class InvProductDetailEntity implements Serializable {
      * 耗材字典ID
      */
     @TableField(value = "relId")
-    private String relId;
+    private Long relId;
 
     /**
      * 最小销售标识

src/main/java/com/glxp/api/req/system/DeleteRequest.java

@@ -9,4 +9,5 @@ public class DeleteRequest {
 
     String id;
     List<String> ids;
+    String billNo;
 }

src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.basic.BasicBusTypePreDao;
 import com.glxp.api.entity.basic.BasicBusTypePreEntity;
+import com.glxp.api.entity.inout.IoCodeEntity;
 import com.glxp.api.req.basic.FilterBusTypeChangeRequest;
 import com.glxp.api.req.basic.FilterBusTypePreRequest;
 import com.glxp.api.res.basic.BasicBusTypePreResponse;
@@ -33,7 +34,7 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService {
         if (null != busTypeChangeFilterRequest.getPage() && null != busTypeChangeFilterRequest.getLimit()) {
             PageHelper.offsetPage((busTypeChangeFilterRequest.getPage() - 1) * busTypeChangeFilterRequest.getLimit(), busTypeChangeFilterRequest.getLimit());
         }
-        return basicBusTypePreDao.selectList(busTypeChangeFilterRequest);
+        return basicBusTypePreDao.filterList(busTypeChangeFilterRequest);
     }
 
     @Override
@@ -75,8 +76,8 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService {
     }
 
     @Override
-    public BasicBusTypePreEntity findByOriginAction(String orginAction) {
-        return basicBusTypePreDao.selectOne(new QueryWrapper<BasicBusTypePreEntity>().eq("originAction", orginAction));
+    public BasicBusTypePreEntity findByOriginAction(String originAction) {
+        return basicBusTypePreDao.selectOne(new QueryWrapper<BasicBusTypePreEntity>().eq("originAction", originAction));
     }
 
     /**

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

@@ -131,6 +131,15 @@ public class IoCheckInoutService {
 
         });
 
+        //临时表转正式表
+        List<IoCodeTempEntity> codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo());
+        for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
+            IoCodeEntity codeEnttity = new IoCodeEntity();
+            BeanUtils.copyProperties(codeTempEntity, codeEnttity);
+            codeService.insert(codeEnttity);
+        }
+        codeTempService.deleteByBillNo(orderEntity.getBillNo());
+
         orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
         orderEntity.setUpdateTime(new Date());
         orderService.update(orderEntity);
@@ -336,6 +345,8 @@ public class IoCheckInoutService {
                     orderEntity.setStatus(ConstantStatus.ORDER_STATUS_RECEIVEED);
                 }
             }
+        } else {
+            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_RECEIVEED);
         }
         if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_RECEIVEED) {
             orderEntity.setUpdateTime(new Date());

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

@@ -111,6 +111,7 @@ public class IoGenInvService {
         for (IoCodeEntity codeEntity : codeEnttities) {
             InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
             BeanUtils.copyProperties(codeEntity, invProductDetailEntity);
+            invProductDetailEntity.setRelId(codeEntity.getRelId());
             invProductDetailEntity.setUpdateTime(new Date());
             invProductDetailEntity.setPurchaseType(ConstantStatus.PRUCHASE_COMMON);
             invProductDetailEntities.add(invProductDetailEntity);
@@ -221,6 +222,7 @@ public class IoGenInvService {
             temps = filterSupMaps.get(corpName);
             IoOrderEntity outOrder = new IoOrderEntity();
             BeanUtils.copyProperties(orderEntity, outOrder);
+            outOrder.setId(null);
             outOrder.setSupplementNo(null);//补单需置空
             outOrder.setCreateTime(DateUtil.getBeforeDay(DateUtil.fromDate(orderEntity), bussinessChangeTypeEntity.getBeforeTime()));
             outOrder.setAction(targetBustypeEntity.getAction());

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

@@ -16,6 +16,8 @@ public interface IoOrderDetailBizService {
 
     int deleteById(Integer id);
 
+    int deleteByOrderId(String billNo);
+
     boolean isExit(Long relId, String bacthNo, Integer ignoreId);
 
     List<IoOrderDetailBizResponse> filterList(FilterOrderDetailBizRequest orderDetailBizRequest);

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

@@ -32,7 +32,7 @@ public interface IoOrderDetailCodeService {
      * @param orderId
      * @return
      */
-    BaseResponse deleteByOrderId(String orderId);
+    int deleteByOrderId(String orderId);
 
     public List<IoOrderDetailCodeEntity> checkOrderList(String orderId);
 }

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

@@ -12,6 +12,8 @@ public interface IoOrderDetailResultService {
 
     int insert(IoOrderDetailResultEntity orderDetailResultEntity);
 
+    int deleteByOrderId(String billNo);
+
     int update(IoOrderDetailResultEntity orderDetailResultEntity);
 
     List<IoOrderDetailResultResponse> filterList(FilterOrderDetailResultRequest orderDetailResultRequest);

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

@@ -23,6 +23,10 @@ public interface IoOrderService {
 
     int updateByBillNo(IoOrderEntity orderEntity);
 
+    int deleteById(Integer id);
+
+    int deleteByBillNo(String billNo);
+
     /**
      * 查询单据列表
      *

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -42,6 +42,11 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         return ioOrderDetailBizDao.deleteById(id);
     }
 
+    @Override
+    public int deleteByOrderId(String billNo) {
+        return ioOrderDetailBizDao.delete(new QueryWrapper<IoOrderDetailBizEntity>().eq("orderIdFk", billNo));
+    }
+
 
     @Override
     public boolean isExit(Long relId, String bacthNo, Integer ignoreId) {

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java

@@ -58,12 +58,8 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
     }
 
     @Override
-    public BaseResponse deleteByOrderId(String orderId) {
-        if (StrUtil.isBlank(orderId)) {
-            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "单据号不能为空！");
-        }
-        ioOrderDetailCodeDao.delete(new QueryWrapper<IoOrderDetailCodeEntity>().eq("orderIdFk", orderId));
-        return ResultVOUtils.success("删除成功");
+    public int deleteByOrderId(String orderId) {
+        return ioOrderDetailCodeDao.delete(new QueryWrapper<IoOrderDetailCodeEntity>().eq("orderIdFk", orderId));
     }
 
 

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java

@@ -29,6 +29,11 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic
         return orderDetailResultDao.insert(orderDetailResultEntity);
     }
 
+    @Override
+    public int deleteByOrderId(String billNo) {
+        return orderDetailResultDao.delete(new QueryWrapper<IoOrderDetailResultEntity>().eq("orderIdFk", billNo));
+    }
+
     @Override
     public int update(IoOrderDetailResultEntity orderDetailResultEntity) {
         return orderDetailResultDao.updateById(orderDetailResultEntity);

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -60,6 +60,16 @@ public class IoOrderServiceImpl implements IoOrderService {
         return orderDao.update(orderEntity, new QueryWrapper<IoOrderEntity>().eq("billNo", orderEntity.getBillNo()));
     }
 
+    @Override
+    public int deleteById(Integer id) {
+        return orderDao.deleteById(id);
+    }
+
+    @Override
+    public int deleteByBillNo(String billNo) {
+        return orderDao.delete(new QueryWrapper<IoOrderEntity>().eq("billNo", billNo));
+    }
+
     @Override
     public List<IoOrderResponse> filterList(FilterOrderRequest filterOrderRequest) {
         if (null == filterOrderRequest) {

src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: Glxp@6066
+    password: 123456
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 60

src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.basic.BasicBusTypePreDao">
-    <select id="selectList" resultType="com.glxp.api.entity.basic.BasicBusTypePreEntity">
+    <select id="filterList" resultType="com.glxp.api.entity.basic.BasicBusTypePreEntity">
         select *
         from basic_bustype_pre
         <where>
-            <if test="originName != null and originName != ''">
+            <if test="originAction != null and originAction != ''">
                 AND originAction like concat('%', #{originAction}, '%')
             </if>
         </where>
@@ -18,12 +18,12 @@
     </delete>
 
     <select id="findByAction" resultType="com.glxp.api.entity.basic.BasicBusTypePreEntity">
-        select basic_bustype_pre.* ,
-            basic_bussiness_type.name
+        select basic_bustype_pre.*,
+               basic_bussiness_type.name
         from basic_bustype_pre
-        left join basic_bussiness_type on basic_bustype_pre.originAction = basic_bussiness_type.action
-        left join auth_dept on basic_bustype_pre.defaultDeptCode = auth_dept.code
-        left join auth_warehouse on basic_bustype_pre.defaultInvCode = auth_warehouse.code
+                 left join basic_bussiness_type on basic_bustype_pre.originAction = basic_bussiness_type.action
+                 left join auth_dept on basic_bustype_pre.defaultDeptCode = auth_dept.code
+                 left join auth_warehouse on basic_bustype_pre.defaultInvCode = auth_warehouse.code
         where basic_bustype_pre.action = #{action}
     </select>