From c5dab991d39690658d1791de30bbad5d6a3ebbd6 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 22 Feb 2023 15:36:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 3 +- .../inv/InvPreinOrderController.java | 35 +++++++++- .../glxp/api/dao/inv/InvPreinDetailDao.java | 10 +++ .../glxp/api/dao/inv/InvPreinOrderDao.java | 2 +- .../basic/BasicBussinessTypeEntity.java | 4 ++ .../api/entity/inv/InvPreinOrderEntity.java | 5 +- .../req/inv/FilterInvPreinDetailRequest.java | 10 +++ .../api/req/inv/FilterInvPreinRequest.java | 3 + .../res/basic/BasicBussinessTypeResponse.java | 2 + .../glxp/api/res/inout/IoOrderResponse.java | 1 + .../api/res/inv/InvPreinDetailResponse.java | 66 +++++++++++++++++++ .../api/res/inv/InvPreinOrderResponse.java | 8 +++ .../service/inout/IoCheckInoutService.java | 33 +++++++++- .../inv/InvPreProductDetailService.java | 2 + .../service/inv/InvPreinDetailService.java | 15 +++++ .../api/service/inv/InvPreinOrderService.java | 2 + .../impl/InvPreProductDetailServiceImpl.java | 1 + .../inv/impl/InvPreinDetailServiceImpl.java | 38 ++++++++++- .../inv/impl/InvPreinOrderServiceImpl.java | 2 +- .../mapper/basic/BasicBussinessTypeDao.xml | 4 +- .../mybatis/mapper/inv/InvPreinDetailDao.xml | 18 +++++ .../mybatis/mapper/inv/InvPreinOrderDao.xml | 34 ++++++++++ 22 files changed, 285 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/inv/FilterInvPreinDetailRequest.java create mode 100644 src/main/java/com/glxp/api/res/inv/InvPreinDetailResponse.java create mode 100644 src/main/resources/mybatis/mapper/inv/InvPreinDetailDao.xml create mode 100644 src/main/resources/mybatis/mapper/inv/InvPreinOrderDao.xml diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index cd49796eb..f9a895a67 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -442,7 +442,7 @@ public class IoCodeTempController extends BaseController { } //校验预验收库存是否已存在 - if (addOrderRequest.isPreCheck()) { + if (bussinessTypeEntity.isScanPreIn()) { InvPreinDetailEntity invProductDetailEntity = invPreinDetailService.findOneByCode(code); if (invProductDetailEntity == null) { return ResultVOUtils.error(500, "预验收库存未存在此产品！"); @@ -450,7 +450,6 @@ public class IoCodeTempController extends BaseController { if (StrUtil.isNotEmpty(invProductDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(addOrderRequest.getBatchNo()) && !invProductDetailEntity.getBatchNo().equals(addOrderRequest.getBatchNo())) { return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！"); - } if (StrUtil.isNotEmpty(orderId)) {//非首次添加 if (StrUtil.isEmpty(udiEntity.getSerialNo())) {//该单据已有该产品 diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java index 35f2b7377..3d198ea7d 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java @@ -2,16 +2,23 @@ package com.glxp.api.controller.inv; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; -import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.req.inv.FilterInvPreinDetailRequest; import com.glxp.api.req.inv.FilterInvPreinRequest; -import com.glxp.api.res.inout.IoOrderResponse; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.res.inv.InvPreinDetailResponse; import com.glxp.api.res.inv.InvPreinOrderResponse; +import com.glxp.api.service.inv.InvPreProductDetailService; +import com.glxp.api.service.inv.InvPreinDetailService; import com.glxp.api.service.inv.InvPreinOrderService; import lombok.extern.slf4j.Slf4j; +import org.apache.regexp.RE; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -24,7 +31,8 @@ public class InvPreinOrderController extends BaseController { @Resource InvPreinOrderService invPreinOrderService; - + @Resource + InvPreinDetailService invPreinDetailService; @GetMapping("/udiwms/inv/prein/filter") public BaseResponse filterOrder(FilterInvPreinRequest filterInvPreinRequest) { @@ -33,4 +41,25 @@ public class InvPreinOrderController extends BaseController { return ResultVOUtils.page(pageInfo); } + + @GetMapping("/udiwms/inv/prein/detail") + public BaseResponse filterDetail(FilterInvPreinDetailRequest filterInvPreinDetailRequest) { + List list = invPreinDetailService.filterList(filterInvPreinDetailRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + + @AuthRuleAnnotation("") + @PostMapping("udiwms/inv/prein/delete") + public BaseResponse deletById(@RequestBody DeleteRequest deleteRequest) { + + if (StrUtil.isEmpty(deleteRequest.getBillNo())) + return ResultVOUtils.error(500, "单据号不能为空"); + invPreinOrderService.deleteByOrderId(deleteRequest.getBillNo()); + invPreinDetailService.deleteByOrderId(deleteRequest.getBillNo()); + return ResultVOUtils.success("删除成功！"); + + } + } diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreinDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreinDetailDao.java index 7ff41b1ea..599e1e93b 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreinDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreinDetailDao.java @@ -3,8 +3,18 @@ package com.glxp.api.dao.inv; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inv.InvPreinDetailEntity; import com.glxp.api.entity.inv.InvPreinOrderEntity; +import com.glxp.api.req.inv.FilterInvPreinDetailRequest; +import com.glxp.api.req.inv.FilterInvPreinRequest; +import com.glxp.api.res.inv.InvPreinDetailResponse; +import com.glxp.api.res.inv.InvPreinOrderResponse; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface InvPreinDetailDao extends BaseMapperPlus { + + + List filterList(FilterInvPreinDetailRequest filterInvPreinDetailRequest); + } diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreinOrderDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreinOrderDao.java index a9e7b452f..939429c72 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreinOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreinOrderDao.java @@ -12,6 +12,6 @@ import java.util.List; public interface InvPreinOrderDao extends BaseMapperPlus { - public List filterList(FilterInvPreinRequest filterInvPreinRequest); + List filterList(FilterInvPreinRequest filterInvPreinRequest); } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index f4383cd5a..79856631b 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -315,6 +315,10 @@ public class BasicBussinessTypeEntity { @TableField(value = "preIn") private boolean preIn; + + @TableField(value = "preInBack") + private boolean preInBack; + /** * 缺量补单是否全量补单 */ diff --git a/src/main/java/com/glxp/api/entity/inv/InvPreinOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/InvPreinOrderEntity.java index 6b0f0696b..2f98b9c5c 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvPreinOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvPreinOrderEntity.java @@ -74,6 +74,9 @@ public class InvPreinOrderEntity { @TableField(value = "customerId") private Integer customerId; + @TableField(value = "deptCode") + private String deptCode; + /** * 当前仓库 */ @@ -86,4 +89,4 @@ public class InvPreinOrderEntity { @TableField(value = "remark") private String remark; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvPreinDetailRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvPreinDetailRequest.java new file mode 100644 index 000000000..f7533120b --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/FilterInvPreinDetailRequest.java @@ -0,0 +1,10 @@ +package com.glxp.api.req.inv; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class FilterInvPreinDetailRequest extends ListPageRequest { + + private String orderId; +} diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvPreinRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvPreinRequest.java index 94763eae6..d4eb96a99 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvPreinRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterInvPreinRequest.java @@ -7,5 +7,8 @@ import lombok.Data; public class FilterInvPreinRequest extends ListPageRequest { private String billNo; + private String fromCorp; + private String startTime; + private String endTime; } diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java index 754e35c34..305e1ad9e 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -82,6 +82,7 @@ public class BasicBussinessTypeResponse { private String prefix; private String localPrefix; private boolean preIn; + private boolean preInBack; private boolean outToSpms; private boolean ullageFill; private boolean scanPreIn; @@ -122,4 +123,5 @@ public class BasicBussinessTypeResponse { */ private String originAction; + } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 56b8c25f8..a875416fe 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -209,6 +209,7 @@ public class IoOrderResponse { private boolean enableSupplementOrder; + public String getFromName() { if (StrUtil.isNotEmpty(fromCorpName)) diff --git a/src/main/java/com/glxp/api/res/inv/InvPreinDetailResponse.java b/src/main/java/com/glxp/api/res/inv/InvPreinDetailResponse.java new file mode 100644 index 000000000..a765fc1c9 --- /dev/null +++ b/src/main/java/com/glxp/api/res/inv/InvPreinDetailResponse.java @@ -0,0 +1,66 @@ +package com.glxp.api.res.inv; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +@Data +public class InvPreinDetailResponse { + + + private Integer id; + + /** + * 条码 + */ + private String code; + + /** + * 单据号外键 + */ + private String orderId; + + /** + * 最小销售表示 + */ + private String nameCode; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String produceDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 序列号 + */ + private String serialNo; + + /** + * 耗材字典主键 + */ + private Long relId; + + /** + * 扫码数量 + */ + private int count; + + /** + * 实际数量 + */ + private int reCount; + + private String productName; + +} diff --git a/src/main/java/com/glxp/api/res/inv/InvPreinOrderResponse.java b/src/main/java/com/glxp/api/res/inv/InvPreinOrderResponse.java index 7a8a05746..8d600f673 100644 --- a/src/main/java/com/glxp/api/res/inv/InvPreinOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inv/InvPreinOrderResponse.java @@ -69,5 +69,13 @@ public class InvPreinOrderResponse { */ private String remark; + private String billTypeNames; + private String createUserName; + private String updateUserName; + private String reviewUserName; + private String fromCorpName; + + private String deptName; + private String invName; } diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 682db432b..7460d2b93 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -11,6 +11,7 @@ import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inv.InvPreinDetailService; import com.glxp.api.service.inv.InvPreinOrderService; +import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -512,8 +513,36 @@ public class IoCheckInoutService { IoOrderEntity preInEntity = orderService.findByBillNo(key); preInEntity.setPreOutBillNo(orderEntity.getBillNo()); orderService.update(preInEntity); - invPreinOrderService.deleteByOrderId(preInEntity.getBillNo()); - invPreinDetailService.deleteByOrderId(preInEntity.getBillNo()); + + if (bussinessTypeEntity.isPreInBack()) { //预验收如果带回，则清空相关预验收库存； + invPreinOrderService.deleteByOrderId(preInEntity.getBillNo()); + invPreinDetailService.deleteByOrderId(preInEntity.getBillNo()); + } else { //预验收如果不带回，则清除已出库相关库存 + for (IoCodeEntity codeEntity : codeList) { + if (StrUtil.isEmpty(codeEntity.getSerialNo())) { + InvPreinDetailEntity invPreinDetailEntity = invPreinDetailService.findByCode(key, codeEntity.getCode()); + int count = invPreinDetailEntity.getCount() - 1; + if (count == 0) { + invPreinDetailService.deleteByCode(key, codeEntity.getCode()); + } else { + invPreinDetailEntity.setCount(count); + invPreinDetailService.update(invPreinDetailEntity); + } + int reCount = invPreinDetailEntity.getReCount() - codeEntity.getReCount(); + if (reCount == 0) { + invPreinDetailService.deleteByCode(key, codeEntity.getCode()); + } else { + invPreinDetailEntity.setReCount(reCount); + invPreinDetailService.update(invPreinDetailEntity); + } + } else { + invPreinDetailService.deleteByCode(key, codeEntity.getCode()); + } + } + + } + + } orderEntity.setPreInBillNo(preInBillNo.substring(1)); orderService.update(orderEntity); diff --git a/src/main/java/com/glxp/api/service/inv/InvPreProductDetailService.java b/src/main/java/com/glxp/api/service/inv/InvPreProductDetailService.java index d3c95db23..de9aa4aa6 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreProductDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreProductDetailService.java @@ -39,4 +39,6 @@ public interface InvPreProductDetailService { * @param detailRequest */ boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest); + + } diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java b/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java index a91adfeb9..dd0c9d369 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java @@ -1,11 +1,18 @@ package com.glxp.api.service.inv; import com.glxp.api.entity.inv.InvPreinDetailEntity; +import com.glxp.api.req.inv.FilterInvPreinDetailRequest; +import com.glxp.api.req.inv.FilterInvPreinRequest; +import com.glxp.api.res.inv.InvPreinDetailResponse; +import com.glxp.api.res.inv.InvPreinOrderResponse; import java.util.List; public interface InvPreinDetailService { + + List filterList(FilterInvPreinDetailRequest filterInvPreinDetailRequest); + void insertList(List invPreinDetailEntities); List findByCode(String code); @@ -13,4 +20,12 @@ public interface InvPreinDetailService { InvPreinDetailEntity findOneByCode(String code); int deleteByOrderId(String orderId); + + + InvPreinDetailEntity findByCode(String orderId, String code); + + int deleteByCode(String orderId, String code); + + int update(InvPreinDetailEntity invPreinDetailEntity); + } diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java b/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java index fcd63a894..2ec9116a8 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java @@ -16,4 +16,6 @@ public interface InvPreinOrderService { public void insert(InvPreinOrderEntity invPreinOrderEntity); int deleteByOrderId(String orderId); + + } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java index 95db50e6f..c6d42857f 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java @@ -83,4 +83,5 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic public boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest) { return invPreProductDetailDao.deleteInvPreProductDetail(detailRequest); } + } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java index e93074ffa..f4bd6e8d8 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java @@ -2,14 +2,19 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inv.InvPreinDetailDao; import com.glxp.api.dao.inv.InvPreinOrderDao; +import com.glxp.api.entity.inv.InvPreProductDetailEntity; import com.glxp.api.entity.inv.InvPreinDetailEntity; +import com.glxp.api.req.inv.FilterInvPreinDetailRequest; +import com.glxp.api.res.inv.InvPreinDetailResponse; import com.glxp.api.service.inv.InvPreinDetailService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Collections; import java.util.List; @Service @@ -19,6 +24,17 @@ public class InvPreinDetailServiceImpl implements InvPreinDetailService { @Resource InvPreinDetailDao invPreinDetailDao; + @Override + public List filterList(FilterInvPreinDetailRequest filterInvPreinDetailRequest) { + if (null == filterInvPreinDetailRequest) { + return Collections.emptyList(); + } + if (null != filterInvPreinDetailRequest.getPage() && null != filterInvPreinDetailRequest.getLimit()) { + PageHelper.offsetPage((filterInvPreinDetailRequest.getPage() - 1) * filterInvPreinDetailRequest.getLimit(), filterInvPreinDetailRequest.getLimit()); + } + return invPreinDetailDao.filterList(filterInvPreinDetailRequest); + } + @Override public void insertList(List invPreinDetailEntities) { invPreinDetailDao.insertBatch(invPreinDetailEntities); @@ -40,7 +56,27 @@ public class InvPreinDetailServiceImpl implements InvPreinDetailService { @Override public int deleteByOrderId(String orderId) { - return invPreinDetailDao.delete(new QueryWrapper().eq("orderIdFk", orderId)); + return invPreinDetailDao.delete(new QueryWrapper().eq("orderId", orderId)); + } + + @Override + public InvPreinDetailEntity findByCode(String orderId, String code) { + List invPreinDetailEntities = invPreinDetailDao.selectList(new QueryWrapper().eq("orderId", orderId).eq("code", code).last("limit 1")); + if (CollUtil.isNotEmpty(invPreinDetailEntities)) { + return invPreinDetailEntities.get(0); + } + return null; + } + + + @Override + public int deleteByCode(String orderId, String code) { + return invPreinDetailDao.delete(new QueryWrapper().eq("orderId", orderId).eq("code", code)); + } + + @Override + public int update(InvPreinDetailEntity invPreinDetailEntity) { + return invPreinDetailDao.updateById(invPreinDetailEntity); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreinOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreinOrderServiceImpl.java index 1ff54cc9b..ff1d6c28c 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreinOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreinOrderServiceImpl.java @@ -39,7 +39,7 @@ public class InvPreinOrderServiceImpl implements InvPreinOrderService { @Override public int deleteByOrderId(String orderId) { - return invPreinOrderDao.delete(new QueryWrapper().eq("orderId", orderId)); + return invPreinOrderDao.delete(new QueryWrapper().eq("billNo", orderId)); } } diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml index 34e3cfb94..1d494008e 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -63,7 +63,7 @@ defaultUnit, prefix, outToSpms, ullageFill, scanPreIn, vailInv, entrutSpms, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, checkCopy, secCheckCopy, originAction, advanceType, changeEnable, - spUse, preIn, supplementAll, createUser, createTime) + spUse, preIn, supplementAll, createUser, createTime,preInBack) values ( #{mainAction}, #{action}, @@ -116,7 +116,7 @@ #{preIn}, #{supplementAll}, #{createUser}, - #{createTime} + #{createTime},#{preInBack} ) diff --git a/src/main/resources/mybatis/mapper/inv/InvPreinDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreinDetailDao.xml new file mode 100644 index 000000000..1aef94df1 --- /dev/null +++ b/src/main/resources/mybatis/mapper/inv/InvPreinDetailDao.xml @@ -0,0 +1,18 @@ + + + + + diff --git a/src/main/resources/mybatis/mapper/inv/InvPreinOrderDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreinOrderDao.xml new file mode 100644 index 000000000..b5b7dda7d --- /dev/null +++ b/src/main/resources/mybatis/mapper/inv/InvPreinOrderDao.xml @@ -0,0 +1,34 @@ + + + + +