From c9d87c807039fe327019e5286d4a2df572412179 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 14 Mar 2024 10:59:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=B9=E5=87=BA=E5=BA=93=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E7=94=9F=E6=88=90=E5=8D=95=E6=8D=AEbug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/thrsys/ThrInvOrderDetailMapper.java | 11 - .../inout/impl/IoOrderServiceImpl.java | 10 +- .../impl/ThrInvOrderDetailServiceImpl.java | 2 +- .../mapper/thrsys/ThrInvOrderDetailMapper.xml | 439 +----------------- 4 files changed, 26 insertions(+), 436 deletions(-) diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java b/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java index 3a14027c2..28beef238 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java @@ -12,17 +12,6 @@ import java.util.List; @Mapper public interface ThrInvOrderDetailMapper extends BaseMapperPlus { - int deleteByPrimaryKey(Integer id); - - int insert(ThrInvOrderDetail record); - - int insertSelective(ThrInvOrderDetail record); - - ThrInvOrderDetail selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(ThrInvOrderDetail record); - - int updateByPrimaryKey(ThrInvOrderDetail record); List filterThrOrderDetailDetail(FilterThrInvOrderDetailRequest filterThrInvOrderDetailRequest); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index afc9516e2..11710f709 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -983,27 +983,27 @@ public class IoOrderServiceImpl implements IoOrderService { IoOrderEntity orderEntity = findByBillNo(billNo); ThrOrderUploadBustypesEntity thrOrderUploadBustypesEntity = thrOrderUploadBustypesService.findByAction(orderEntity.getAction()); if (thrOrderUploadBustypesEntity == null) { - log.error(billNo + ":" + orderEntity.getAction() + "单据类型未设置自动上传"); +// log.error(billNo + ":" + orderEntity.getAction() + "单据类型未设置自动上传"); continue; } if (!thrOrderUploadBustypesEntity.getOrderSource().contains(orderEntity.getFromType() + "")) { - log.error(billNo + ":" + "单据来源不允许自动提交"); +// log.error(billNo + ":" + "单据来源不允许自动提交"); continue; } if (IntUtil.value(thrOrderUploadBustypesEntity.getOrderStatus()) == 1) { if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW) { - log.error(billNo + ":" + "非待审核单据"); +// log.error(billNo + ":" + "非待审核单据"); continue; } } else if (IntUtil.value(thrOrderUploadBustypesEntity.getOrderStatus()) == 2) { if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_AUDITED) { - log.error(billNo + ":" + "非已审核单据"); +// log.error(billNo + ":" + "非已审核单据"); continue; } } else if (IntUtil.value(thrOrderUploadBustypesEntity.getOrderStatus()) == 3) { if (IntUtil.value(orderEntity.getCheckStatus()) != 1) { - log.error(billNo + ":" + "非已确认单据"); +// log.error(billNo + ":" + "非已确认单据"); continue; } } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderDetailServiceImpl.java index d0bb45156..ce69c03e1 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderDetailServiceImpl.java @@ -35,7 +35,7 @@ public class ThrInvOrderDetailServiceImpl implements ThrInvOrderDetailService { @Override public int delThrInvOrderDetail(Integer id) { - return thrInvOrderDetailMapper.deleteByPrimaryKey(id); + return thrInvOrderDetailMapper.deleteById(id); } @Override diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml b/src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml index 1671d93f2..baad34469 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml @@ -1,424 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, orderIdFk, cpmctymc, relId, thrCode, nameCode, ggxh, batchNo, measname, price, - productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh, inCount, outCount, supName, - deptName, deptCode, invName, invCode, spaceCode, spaceName, reCount, mainAction, - manufacturer, remark,udiCode,serialNo,sickerCode,sickerName - - - - - delete from thr_inv_order_detail - where id = #{id,jdbcType=INTEGER} - - - - insert into thr_inv_order_detail (orderIdFk, cpmctymc, relId, - thrCode, nameCode, ggxh, - batchNo, measname, price, - productionDate, expireDate, ylqxzcrbarmc, - zczbhhzbapzbh, inCount, outCount, - supName, deptName, deptCode, - invName, invCode, spaceCode, - spaceName, reCount, mainAction, - manufacturer, remark,udiCode,serialNo,sickerCode,sickerName) - values (#{orderIdFk,jdbcType=VARCHAR}, #{cpmctymc,jdbcType=VARCHAR}, #{relId,jdbcType=INTEGER}, - #{thrCode,jdbcType=VARCHAR}, #{nameCode,jdbcType=VARCHAR}, #{ggxh,jdbcType=VARCHAR}, - #{batchNo,jdbcType=VARCHAR}, #{measname,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, - #{productionDate,jdbcType=TIMESTAMP}, #{expireDate,jdbcType=TIMESTAMP}, #{ylqxzcrbarmc,jdbcType=VARCHAR}, - #{zczbhhzbapzbh,jdbcType=VARCHAR}, #{inCount,jdbcType=VARCHAR}, #{outCount,jdbcType=VARCHAR}, - #{supName,jdbcType=VARCHAR}, #{deptName,jdbcType=VARCHAR}, #{deptCode,jdbcType=VARCHAR}, - #{invName,jdbcType=VARCHAR}, #{invCode,jdbcType=VARCHAR}, #{spaceCode,jdbcType=VARCHAR}, - #{spaceName,jdbcType=VARCHAR}, #{reCount,jdbcType=VARCHAR}, #{mainAction,jdbcType=VARCHAR}, - #{manufacturer,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{udiCode,jdbcType=VARCHAR}, #{serialNo,jdbcType=VARCHAR} - , #{sickerCode,jdbcType=VARCHAR}, #{sickerName,jdbcType=VARCHAR}) - - - - insert into thr_inv_order_detail - - - orderIdFk, - - - cpmctymc, - - - relId, - - - thrCode, - - - nameCode, - - - ggxh, - - - batchNo, - - - measname, - - - price, - - - productionDate, - - - expireDate, - - - ylqxzcrbarmc, - - - zczbhhzbapzbh, - - - inCount, - - - outCount, - - - supName, - - - deptName, - - - deptCode, - - - invName, - - - invCode, - - - spaceCode, - - - spaceName, - - - reCount, - - - mainAction, - - - manufacturer, - - - remark, - - - udiCode, - - - serialNo, - - - sickerCode, - - - sickerName, - - - - - #{orderIdFk,jdbcType=VARCHAR}, - - - #{cpmctymc,jdbcType=VARCHAR}, - - - #{relId,jdbcType=INTEGER}, - - - #{thrCode,jdbcType=VARCHAR}, - - - #{nameCode,jdbcType=VARCHAR}, - - - #{ggxh,jdbcType=VARCHAR}, - - - #{batchNo,jdbcType=VARCHAR}, - - - #{measname,jdbcType=VARCHAR}, - - - #{price,jdbcType=DECIMAL}, - - - #{productionDate,jdbcType=TIMESTAMP}, - - - #{expireDate,jdbcType=TIMESTAMP}, - - - #{ylqxzcrbarmc,jdbcType=VARCHAR}, - - - #{zczbhhzbapzbh,jdbcType=VARCHAR}, - - - #{inCount,jdbcType=VARCHAR}, - - - #{outCount,jdbcType=VARCHAR}, - - - #{supName,jdbcType=VARCHAR}, - - - #{deptName,jdbcType=VARCHAR}, - - - #{deptCode,jdbcType=VARCHAR}, - - - #{invName,jdbcType=VARCHAR}, - - - #{invCode,jdbcType=VARCHAR}, - - - #{spaceCode,jdbcType=VARCHAR}, - - - #{spaceName,jdbcType=VARCHAR}, - - - #{reCount,jdbcType=VARCHAR}, - - - #{mainAction,jdbcType=VARCHAR}, - - - #{manufacturer,jdbcType=VARCHAR}, - - - #{remark,jdbcType=VARCHAR}, - - - #{udiCode,jdbcType=VARCHAR}, - - - #{serialNo,jdbcType=VARCHAR}, - - - #{sickerCode,jdbcType=VARCHAR}, - - - #{sickerName,jdbcType=VARCHAR}, - - - - - - update thr_inv_order_detail - - - orderIdFk = #{orderIdFk,jdbcType=VARCHAR}, - - - cpmctymc = #{cpmctymc,jdbcType=VARCHAR}, - - - relId = #{relId,jdbcType=INTEGER}, - - - thrCode = #{thrCode,jdbcType=VARCHAR}, - - - nameCode = #{nameCode,jdbcType=VARCHAR}, - - - ggxh = #{ggxh,jdbcType=VARCHAR}, - - - batchNo = #{batchNo,jdbcType=VARCHAR}, - - - measname = #{measname,jdbcType=VARCHAR}, - - - price = #{price,jdbcType=DECIMAL}, - - - productionDate = #{productionDate,jdbcType=TIMESTAMP}, - - - expireDate = #{expireDate,jdbcType=TIMESTAMP}, - - - ylqxzcrbarmc = #{ylqxzcrbarmc,jdbcType=VARCHAR}, - - - zczbhhzbapzbh = #{zczbhhzbapzbh,jdbcType=VARCHAR}, - - - inCount = #{inCount,jdbcType=VARCHAR}, - - - outCount = #{outCount,jdbcType=VARCHAR}, - - - supName = #{supName,jdbcType=VARCHAR}, - - - deptName = #{deptName,jdbcType=VARCHAR}, - - - deptCode = #{deptCode,jdbcType=VARCHAR}, - - - invName = #{invName,jdbcType=VARCHAR}, - - - invCode = #{invCode,jdbcType=VARCHAR}, - - - spaceCode = #{spaceCode,jdbcType=VARCHAR}, - - - spaceName = #{spaceName,jdbcType=VARCHAR}, - - - reCount = #{reCount,jdbcType=VARCHAR}, - - - mainAction = #{mainAction,jdbcType=VARCHAR}, - - - manufacturer = #{manufacturer,jdbcType=VARCHAR}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - udiCode = #{udiCode,jdbcType=VARCHAR}, - - - serialNo = #{serialNo,jdbcType=VARCHAR}, - - - sickerCode = #{sickerCode,jdbcType=VARCHAR}, - - - sickerName = #{sickerName,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - - update thr_inv_order_detail - set orderIdFk = #{orderIdFk,jdbcType=VARCHAR}, - cpmctymc = #{cpmctymc,jdbcType=VARCHAR}, - relId = #{relId,jdbcType=INTEGER}, - thrCode = #{thrCode,jdbcType=VARCHAR}, - nameCode = #{nameCode,jdbcType=VARCHAR}, - ggxh = #{ggxh,jdbcType=VARCHAR}, - batchNo = #{batchNo,jdbcType=VARCHAR}, - measname = #{measname,jdbcType=VARCHAR}, - price = #{price,jdbcType=DECIMAL}, - productionDate = #{productionDate,jdbcType=TIMESTAMP}, - expireDate = #{expireDate,jdbcType=TIMESTAMP}, - ylqxzcrbarmc = #{ylqxzcrbarmc,jdbcType=VARCHAR}, - zczbhhzbapzbh = #{zczbhhzbapzbh,jdbcType=VARCHAR}, - inCount = #{inCount,jdbcType=VARCHAR}, - outCount = #{outCount,jdbcType=VARCHAR}, - supName = #{supName,jdbcType=VARCHAR}, - deptName = #{deptName,jdbcType=VARCHAR}, - deptCode = #{deptCode,jdbcType=VARCHAR}, - invName = #{invName,jdbcType=VARCHAR}, - invCode = #{invCode,jdbcType=VARCHAR}, - spaceCode = #{spaceCode,jdbcType=VARCHAR}, - spaceName = #{spaceName,jdbcType=VARCHAR}, - reCount = #{reCount,jdbcType=VARCHAR}, - mainAction = #{mainAction,jdbcType=VARCHAR}, - manufacturer = #{manufacturer,jdbcType=VARCHAR}, - remark = #{remark,jdbcType=VARCHAR}, - udiCode = #{udiCode,jdbcType=VARCHAR}, - serialNo = #{serialNo,jdbcType=VARCHAR}, - sickerCode = #{sickerCode,jdbcType=VARCHAR}, - sickerName = #{sickerName,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - - - - - - - delete from thr_inv_order_detail - where thrCode in - - - #{item} - - - - + + + delete + from thr_inv_order_detail + where thrCode in + + + #{item} + + +