单据类型迁移，内部码打印迁移

src/main/java/com/glxp/api/constant/Constant.java

@@ -231,17 +231,24 @@ public class Constant {
      */
     public static final String ORDER_STATUS_AUDITED = "audited";
 
+
     /**
      * 单据-供应商已审核
      */
     public static final String ORDER_STATUS_SUP_SEARCH = "supSearch";
 
 
+    public static final String ORDER_STATUS_INVOICE = "supInvoice";
+
+    public static final String ORDER_STATUS_INCODE = "supInCode";
+
     /**前端页面查询相关单据类型标识*/
 
 
     /**
      * 送货管理界面：     supDelivery
+     * 审核送货单        supDelAudit
+     * 查询出入库单       supInout
      * 到货单管理界面：    supArrival
      * 退货单管理界面：    supReturned
      * 采购入库单界面：    supPurchase
@@ -254,9 +261,7 @@ public class Constant {
     public static final String ORDER_ACTION_PRE_DETAIL = "preDetail";
     public static final String ORDER_ACTION_SUP_DELIVERY = "supDelivery";
     public static final String ORDER_ACTION_SUP_INVOICE = "supInvoice";
-
+    public static final String ORDER_ACTION_SUP_DELAUDIT = "supDelAudit";
-
+    public static final String ORDER_ACTION_SUP_INOUT = "supInout";
-
-
 
 }

src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java

@@ -2,9 +2,11 @@ package com.glxp.api.controller.basic;
 
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.Log;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.BusinessType;
 import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
 import com.glxp.api.req.basic.FilterBusTypeChangeRequest;
 import com.glxp.api.req.system.DeleteRequest;
@@ -58,6 +60,7 @@ public class BasicBusTypeChangeController {
      * @return
      */
     @PostMapping("/basic/bustype/change/insert")
+    @Log(title = "单据管理", businessType = BusinessType.INSERT)
     public BaseResponse insertBusType(@RequestBody @Valid BasicBusTypeChangeEntity basicBusTypeChangeEntity, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@@ -79,6 +82,7 @@ public class BasicBusTypeChangeController {
      * @return
      */
     @PostMapping("/basic/bustype/change/update")
+    @Log(title = "单据管理", businessType = BusinessType.UPDATE)
     public BaseResponse updateBusType(@RequestBody @Valid BasicBusTypeChangeEntity basicBusTypeChangeEntity, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@@ -100,6 +104,7 @@ public class BasicBusTypeChangeController {
      * @return
      */
     @PostMapping("/basic/bustype/change/delete")
+    @Log(title = "单据管理", businessType = BusinessType.DELETE)
     public BaseResponse delBussinessType(@RequestBody @Valid DeleteRequest deleteRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());

src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java

@@ -3,9 +3,11 @@ package com.glxp.api.controller.basic;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.Log;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.BusinessType;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.constant.ConstantType;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
@@ -119,6 +121,7 @@ public class BasicBusTypePreController {
      * @return
      */
     @PostMapping("/spms/busTypePre/remove")
+    @Log(title = "单据管理", businessType = BusinessType.DELETE)
     public BaseResponse removeBuTypePre(@RequestBody BasicBusTypePreEntity basicBusTypePreEntity, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@@ -140,6 +143,7 @@ public class BasicBusTypePreController {
      * @return
      */
     @PostMapping("/spms/busTypePre/delete")
+    @Log(title = "单据管理", businessType = BusinessType.DELETE)
     public BaseResponse deleteBusTypePre(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@@ -157,6 +161,7 @@ public class BasicBusTypePreController {
      * @return
      */
     @PostMapping("/spms/busTypePre/update")
+    @Log(title = "单据管理", businessType = BusinessType.UPDATE)
     public BaseResponse updateBusTypePre(@RequestBody BasicBusTypePreEntity basicBusTypePreEntity, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@@ -165,7 +170,7 @@ public class BasicBusTypePreController {
             //判断是否重复添加
             boolean result = basicBusTypePreService.verifyExists(basicBusTypePreEntity);
             if (result) {
-                return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加！");
+                return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在，不允许重复添加！");
             }
 
             basicBusTypePreService.updateBusChangeType(basicBusTypePreEntity);
@@ -183,6 +188,7 @@ public class BasicBusTypePreController {
      * @return
      */
     @PostMapping("/spms/busTypePre/insert")
+    @Log(title = "单据管理", businessType = BusinessType.INSERT)
     public BaseResponse insertBusTypePre(@RequestBody BasicBusTypePreEntity basicBusTypePreEntity, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@@ -191,7 +197,7 @@ public class BasicBusTypePreController {
             //判断是否重复添加
             boolean result = basicBusTypePreService.verifyExists(basicBusTypePreEntity);
             if (result) {
-                return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加！");
+                return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在，不允许重复添加！");
             }
 
             if (StrUtil.isNotBlank(basicBusTypePreEntity.getDefaultInvCode())) {

src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java

@@ -6,9 +6,12 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.annotation.Log;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.BusinessType;
+import com.glxp.api.constant.ConstantType;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.req.basic.BusNoUserRequest;
@@ -116,6 +119,7 @@ public class BasicBussinessTypeController extends BaseController {
      * @return
      */
     @PostMapping(value = "/udiwms/bussinessType/insert")
+    @Log(title = "单据管理", businessType = BusinessType.INSERT)
     public BaseResponse insertBussinessType(@RequestBody @Valid BussinessTypeSaveRequest bussinessTypeSaveRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@@ -144,6 +148,7 @@ public class BasicBussinessTypeController extends BaseController {
      * @return
      */
     @PostMapping("/udiwms/bussinessType/update")
+    @Log(title = "单据管理", businessType = BusinessType.UPDATE)
     public BaseResponse updateBussinessType(@RequestBody BussinessTypeSaveRequest bussinessTypeSaveRequest,
                                             BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -171,9 +176,6 @@ public class BasicBussinessTypeController extends BaseController {
     public BaseResponse filterJoinByUser(FilterBussinessTypeRequest bussinessTypeFilterRequest,
                                          BindingResult bindingResult) {
 
-        if (bindingResult.hasErrors()) {
-            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
-        }
 
         if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getVueType())) {
             List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findByVueType(bussinessTypeFilterRequest.getVueType());
@@ -208,6 +210,7 @@ public class BasicBussinessTypeController extends BaseController {
      * @return
      */
     @PostMapping("/udiwms/bussinessType/delete")
+    @Log(title = "单据管理", businessType = BusinessType.DELETE)
     public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
@@ -350,4 +353,40 @@ public class BasicBussinessTypeController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/busType/change/origin")
+    public BaseResponse changeOrigins(FilterBussinessTypeRequest bussinessTypeFilterRequest,
+                                      BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        bussinessTypeFilterRequest.setEnable(true);
+
+        List<BasicBussinessTypeResponse> bussinessTypeEntities;
+        bussinessTypeEntities = basicBussinessTypeService.filterList(bussinessTypeFilterRequest);
+        PageSimpleResponse<BasicBussinessTypeResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setList(bussinessTypeEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/busType/change/target")
+    public BaseResponse changeTarget(FilterBussinessTypeRequest bussinessTypeFilterRequest,
+                                     BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        bussinessTypeFilterRequest.setEnable(true);
+        bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_PUT);
+        List<BasicBussinessTypeResponse> bussinessTypeEntities;
+        bussinessTypeEntities = basicBussinessTypeService.filterList(bussinessTypeFilterRequest);
+        PageSimpleResponse<BasicBussinessTypeResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setList(bussinessTypeEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
 }

src/main/java/com/glxp/api/controller/basic/BasicInCodeController.java

@@ -1,12 +1,13 @@
 package com.glxp.api.controller.basic;
 
 
-
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.annotation.Log;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.BusinessType;
 import com.glxp.api.entity.basic.BasicCorpEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
@@ -70,6 +71,7 @@ public class BasicInCodeController {
     }
 
     @PostMapping("/udiwms/stock/order/addOrderPrint")
+    @Log(title = "单据管理", businessType = BusinessType.INSERT)
     public BaseResponse addOrderPrint(@RequestBody invInnerOrderprintReques invInnerOrderprintReques) {
 
         if (invInnerOrderprintReques.getOrderIdFk() != null) {

src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java

@@ -1,24 +1,18 @@
 package com.glxp.api.controller.inv;
 
-import cn.hutool.core.thread.ThreadUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
-import com.glxp.api.dao.inv.InvInnerOrderPdfTempDao;
-import com.glxp.api.entity.inv.InvInnerOrderPrintEntity;
 import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity;
+import com.glxp.api.entity.inv.InvInnerOrderPrintEntity;
 import com.glxp.api.entity.system.SystemPDFModuleEntity;
 import com.glxp.api.entity.system.SystemPDFTemplateEntity;
 import com.glxp.api.req.inout.InspectionPDFTemplateRequest;
 import com.glxp.api.req.inv.*;
 import com.glxp.api.res.PageSimpleResponse;
-import com.glxp.api.res.inv.innerOrderPrintRequest;
+import com.glxp.api.res.inv.InnerOrderPrintResponse;
-import com.glxp.api.service.auth.CustomerService;
-import com.glxp.api.service.basic.UdiProductService;
-import com.glxp.api.service.inv.InnerOrderDetailService;
 import com.glxp.api.service.inv.InvInnerOrderPdfTempService;
 import com.glxp.api.service.inv.InvInnerOrderPrintService;
 import com.glxp.api.service.inv.JaspaperService;
@@ -29,7 +23,6 @@ import com.glxp.api.util.FileUtils;
 import com.glxp.api.util.JasperUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -40,7 +33,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 public class InvInnerOrderPrintController {
@@ -111,23 +107,23 @@ public class InvInnerOrderPrintController {
         SystemPDFTemplateEntity systemPDFTemplateEntity =
                 systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
         if (systemPDFTemplateEntity == null) return null;
-        List<innerOrderPrintRequest> printEntities = new ArrayList<>();
+        List<InnerOrderPrintResponse> printEntities = new ArrayList<>();
-        List<innerOrderPrintRequest> mStockPrintEntities = new ArrayList<>();
+        List<InnerOrderPrintResponse> mStockPrintEntities = new ArrayList<>();
         FilterinnerOrderprintRequest filterinnerOrderprintRequest = new FilterinnerOrderprintRequest();
         if (stockQRCodeTextPDFTemplateRequest.getOrderId() != null) {
             filterinnerOrderprintRequest.setSOrderId(stockQRCodeTextPDFTemplateRequest.getOrderId());
         } else {
             filterinnerOrderprintRequest.setId(stockQRCodeTextPDFTemplateRequest.getQueryId());
         }
-        List<innerOrderPrintRequest> stockPrintEntities = invInnerOrderPrintService.filterJoinInnerPrint(filterinnerOrderprintRequest);
+        List<InnerOrderPrintResponse> stockPrintEntities = invInnerOrderPrintService.filterJoinInnerPrint(filterinnerOrderprintRequest);
         if (stockPrintEntities != null && stockPrintEntities.size() > 0) {
             mStockPrintEntities.addAll(stockPrintEntities);
         }
-        for (innerOrderPrintRequest innerOrderPrintRequest : mStockPrintEntities) {
+        for (InnerOrderPrintResponse innerOrderPrintRequest : mStockPrintEntities) {
             PdfPrintCountEntity pdfPrintCount = getCount(stockQRCodeTextPDFTemplateRequest.getCountList(), innerOrderPrintRequest);
             if (pdfPrintCount != null && pdfPrintCount.getRowCount() > 0) {
                 for (int i = 0; i < pdfPrintCount.getRowCount(); i++) {
-                    innerOrderPrintRequest clone = new innerOrderPrintRequest();
+                    InnerOrderPrintResponse clone = new InnerOrderPrintResponse();
                     BeanUtils.copyProperties(innerOrderPrintRequest, clone);
                     printEntities.add(clone);
                 }
@@ -140,7 +136,7 @@ public class InvInnerOrderPrintController {
             if (!FileUtils.isFileExist(dirPath + "/pdfprint")) {
                 new File(dirPath + "/pdfprint").mkdirs();
             }
-            List<List<innerOrderPrintRequest>> splits = CustomUtil.splitList(printEntities, 100);
+            List<List<InnerOrderPrintResponse>> splits = CustomUtil.splitList(printEntities, 100);
             int index = 0;
             List<InvInnerOrderPdfTempEntity> stockPrintTempEntities = new ArrayList<>();
             for (int i = 0; i < splits.size(); i++) {
@@ -179,7 +175,7 @@ public class InvInnerOrderPrintController {
 
 
         }
-        for (innerOrderPrintRequest innerOrderPrintRequest : mStockPrintEntities) {
+        for (InnerOrderPrintResponse innerOrderPrintRequest : mStockPrintEntities) {
             InvInnerOrderPrintEntity innerOrderPrintEntity = new InvInnerOrderPrintEntity();
             innerOrderPrintEntity.setStatus(1);
             innerOrderPrintEntity.setId(innerOrderPrintRequest.getId());
@@ -189,7 +185,7 @@ public class InvInnerOrderPrintController {
 
     }
 
-    public PdfPrintCountEntity getCount(List<PdfPrintCountEntity> countList, innerOrderPrintRequest innerOrderPrintRequest) {
+    public PdfPrintCountEntity getCount(List<PdfPrintCountEntity> countList, InnerOrderPrintResponse innerOrderPrintRequest) {
         for (PdfPrintCountEntity pdfPrintCount : countList) {
             if (pdfPrintCount.getQueryId().equals(innerOrderPrintRequest.getId() + "")) {
                 return pdfPrintCount;

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

@@ -24,6 +24,7 @@ public interface BasicBussinessTypeDao extends BaseMapperPlus<BasicBussinessType
 
     List<BasicBussinessTypeResponse> filterJoinByUser(FilterBussinessTypeRequest filterBussinessTypeRequest);
 
+    List<BasicBussinessTypeResponse> filterJoinByInv(FilterBussinessTypeRequest filterBussinessTypeRequest);
 
     /**
      * 忽略已存在数据插入单据类型
@@ -71,4 +72,6 @@ public interface BasicBussinessTypeDao extends BaseMapperPlus<BasicBussinessType
      * @return
      */
     String selectNameByAction(@Param("action") String action);
+
+    List<BasicBussinessTypeEntity> selectbyNotAction(@Param("list") List<String> list);
 }

src/main/java/com/glxp/api/dao/inv/InvInnerOrderPrintDao.java

@@ -3,7 +3,7 @@ package com.glxp.api.dao.inv;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.inv.InvInnerOrderPrintEntity;
 import com.glxp.api.req.inv.FilterinnerOrderprintRequest;
-import com.glxp.api.res.inv.innerOrderPrintRequest;
+import com.glxp.api.res.inv.InnerOrderPrintResponse;
 
 import java.util.List;
 
@@ -11,5 +11,5 @@ public interface InvInnerOrderPrintDao extends BaseMapper<InvInnerOrderPrintEnti
 
     List<InvInnerOrderPrintEntity> filterOrderPrintList(FilterinnerOrderprintRequest filterinnerOrderprintRequest);
 
-    List<innerOrderPrintRequest> filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest);
+    List<InnerOrderPrintResponse> filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest);
 }

src/main/java/com/glxp/api/res/inv/InnerOrderPrintResponse.java

@@ -0,0 +1,41 @@
+package com.glxp.api.res.inv;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class InnerOrderPrintResponse {
+    private Integer id;
+    private String udiRlIdFk;
+    private String udiCode;
+    private String nameCode;
+    private String cpmctymc;
+    private String batchNo;
+    private String productDate;
+    private String expireDate;
+    private String serialNo;
+    private String codeType;
+    private String thirdId;
+    private String thirdName;
+    private String printStatus;
+    private String ggxh;
+    private String ylqxzcrbarmc;
+    private String zczbhhzbapzbh;
+    private String warehouseName;
+    private String warehouseCode;
+    private String spaceCode;
+    private String spaceName;
+    private String thirdSysFk;
+    private String nnum;
+    private String genKeyFk;
+
+    private String sOrderId;
+    private String sDetailId;
+    private Date updateTime;
+
+
+    private Integer count;
+    private String corpName;
+
+}

src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java

@@ -21,6 +21,9 @@ public interface IBasicBussinessTypeService {
 
     List<BasicBussinessTypeResponse> filterJoinByUser(FilterBussinessTypeRequest filterBussinessTypeRequest);
 
+    List<BasicBussinessTypeResponse> filterJoinByInv(FilterBussinessTypeRequest filterBussinessTypeRequest);
+
+
     /**
      * 添加单据类型
      *
@@ -113,4 +116,6 @@ public interface IBasicBussinessTypeService {
 
 
     List<BasicBussinessTypeEntity> findByVueType(String vueType);
+
+    List<BasicBussinessTypeEntity> selectbyNotAction(List<String> list);
 }

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

@@ -13,6 +13,7 @@ import com.glxp.api.req.basic.FilterBussinessTypeRequest;
 import com.glxp.api.res.basic.BasicBussinessTypeResponse;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
+import com.glxp.api.service.system.SystemParamConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,6 +56,11 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService
         return basicBussinessTypeDao.filterJoinByUser(filterBussinessTypeRequest);
     }
 
+    @Override
+    public List<BasicBussinessTypeResponse> filterJoinByInv(FilterBussinessTypeRequest filterBussinessTypeRequest) {
+        return basicBussinessTypeDao.filterJoinByInv(filterBussinessTypeRequest);
+    }
+
     @Override
     public boolean insertBussinessType(BasicBussinessTypeEntity bussinessTypeEntity) {
         //设置创建时间和更新时间数据
@@ -191,6 +197,10 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService
         return list;
     }
 
+
+    @Resource
+    SystemParamConfigService systemParamConfigService;
+
     @Override
     public List<BasicBussinessTypeEntity> findByVueType(String vueType) {
 
@@ -204,18 +214,38 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService
 
             case Constant.ORDER_ACTION_PRE_DETAIL:
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
-                        .eq("actionType", 3).eq("inStock", true));
+                        .eq("actionType", 3).eq("inStock", true).eq("enable", true));
                 break;
             case Constant.ORDER_ACTION_SUP_DELIVERY:
+                //允许送货单直接入库变更库存,则不判断送货单是否入库
+                String deliveryInstock = systemParamConfigService.selectValueByParamKey("deliveryInstock");
+                if (StrUtil.isNotEmpty(deliveryInstock) && deliveryInstock.equals("1")) {
                     bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
                             .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
-                        .eq("spUse", true).eq("inStock", false));
+                            .gt("spUse", 1).eq("enable", true));
+                } else {
+                    bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
+                            .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
+                            .gt("spUse", 1).eq("inStock", false).eq("enable", true));
+                }
 
                 break;
             case Constant.ORDER_ACTION_SUP_INVOICE:
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
                         .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
-                        .eq("spUse", true).eq("actionType", 1));
+                        .gt("spUse", 0).eq("actionType", 1).eq("enable", true));
+                break;
+
+
+            case Constant.ORDER_ACTION_SUP_DELAUDIT:        //供应商审核送货单
+                bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
+                        .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
+                        .gt("spUse", 1).eq("enable", true));
+                break;
+
+            case Constant.ORDER_ACTION_SUP_INOUT:        //供应商查询出入库单
+                bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
+                        .gt("spUse", 0).eq("enable", true));
                 break;
             default:
                 break;
@@ -252,4 +282,8 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService
         bussinessTypeEntity.setUpdateTime(now);
     }
 
+    @Override
+    public List<BasicBussinessTypeEntity> selectbyNotAction(List<String> list) {
+        return basicBussinessTypeDao.selectbyNotAction(list);
+    }
 }

src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java

@@ -1,11 +1,10 @@
 package com.glxp.api.service.inv;
 
 import com.glxp.api.entity.inv.InvInnerOrderPrintEntity;
-import com.glxp.api.req.inv.DeleteStPrintTempRequest;
 import com.glxp.api.req.inv.FilterinnerOrderprintRequest;
 import com.glxp.api.req.inv.InnerOrderQRCodeTextPDFTemplateRequest;
 import com.glxp.api.res.PageSimpleResponse;
-import com.glxp.api.res.inv.innerOrderPrintRequest;
+import com.glxp.api.res.inv.InnerOrderPrintResponse;
 
 
 import java.util.List;
@@ -20,14 +19,11 @@ public interface InvInnerOrderPrintService {
 
     InvInnerOrderPrintEntity selectById(String id);
 
-    List<innerOrderPrintRequest> filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest);
+    List<InnerOrderPrintResponse> filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest);
 
     Boolean updateOrder(InvInnerOrderPrintEntity invInnerOrderPrintEntity);
 
     PageSimpleResponse print(InnerOrderQRCodeTextPDFTemplateRequest innerOrderQRCodeTextPDFTemplateRequest);
 
 
-
-
-
 }

src/main/java/com/glxp/api/service/inv/JaspaperService.java

@@ -4,7 +4,7 @@ package com.glxp.api.service.inv;
 import cn.hutool.core.thread.ThreadUtil;
 import com.glxp.api.dao.inv.InvInnerOrderPdfTempDao;
 import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity;
-import com.glxp.api.res.inv.innerOrderPrintRequest;
+import com.glxp.api.res.inv.InnerOrderPrintResponse;
 import com.glxp.api.util.JasperUtils;
 import net.sf.jasperreports.engine.JRException;
 import org.springframework.beans.factory.annotation.Value;
@@ -25,7 +25,7 @@ public class JaspaperService {
     private InvInnerOrderPdfTempDao innerOrderPdfTempDao;
 
     @Async
-    public void printPdfLocal(List<List<innerOrderPrintRequest>> splits, List<InvInnerOrderPdfTempEntity> stockPrintTempEntities, String resource) {
+    public void printPdfLocal(List<List<InnerOrderPrintResponse>> splits, List<InvInnerOrderPdfTempEntity> stockPrintTempEntities, String resource) {
 
         ThreadUtil.execAsync(()  -> {
             for (int i = 0; i < stockPrintTempEntities.size(); i++) {

src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java

@@ -18,11 +18,9 @@ import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.req.inv.*;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
-import com.glxp.api.res.inv.InvCountOrderDetailResponse;
+import com.glxp.api.res.inv.InnerOrderPrintResponse;
-import com.glxp.api.res.inv.innerOrderPrintRequest;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.basic.UdiProductService;
-import com.glxp.api.service.basic.UdiRelevanceService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
 import com.glxp.api.service.inout.IoOrderService;
 import com.glxp.api.service.inv.InnerOrderDetailService;
@@ -35,7 +33,6 @@ import com.glxp.api.util.CustomUtil;
 import com.glxp.api.util.FileUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -133,7 +130,7 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
     }
 
     @Override
-    public List<innerOrderPrintRequest> filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest) {
+    public List<InnerOrderPrintResponse> filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest) {
         if (filterinnerOrderprintRequest == null) {
             return Collections.emptyList();
         }
@@ -142,7 +139,7 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
             PageHelper.offsetPage(offset, filterinnerOrderprintRequest.getLimit());
         }
 
-        List<innerOrderPrintRequest> data = invInnerOrderPrintDao.filterJoinInnerPrint(filterinnerOrderprintRequest);
+        List<InnerOrderPrintResponse> data = invInnerOrderPrintDao.filterJoinInnerPrint(filterinnerOrderprintRequest);
         return data;
     }
 
@@ -161,8 +158,8 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
         SystemPDFTemplateEntity systemPDFTemplateEntity =
                 systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
         if (systemPDFTemplateEntity == null) return null;
-        List<innerOrderPrintRequest> printEntities = new ArrayList<>();
+        List<InnerOrderPrintResponse> printEntities = new ArrayList<>();
-        List<innerOrderPrintRequest> mStockPrintEntities = new ArrayList<>();
+        List<InnerOrderPrintResponse> mStockPrintEntities = new ArrayList<>();
         FilterinnerOrderprintRequest filterStockprintRequest = new FilterinnerOrderprintRequest();
         DeleteStPrintTempRequest deleteStPrintTempRequest = new DeleteStPrintTempRequest();
         if (innerOrderQRCodeTextPDFTemplateRequest.getOrderId() != null) {
@@ -175,27 +172,27 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
         }
 
         innerOrderPdfTempService.delete(deleteStPrintTempRequest);
-        List<innerOrderPrintRequest> stockPrintEntities = invInnerOrderPrintService.filterJoinInnerPrint(filterStockprintRequest);
+        List<InnerOrderPrintResponse> stockPrintEntities = invInnerOrderPrintService.filterJoinInnerPrint(filterStockprintRequest);
         if (stockPrintEntities != null && stockPrintEntities.size() > 0) {
             mStockPrintEntities.addAll(stockPrintEntities);
         }
-        for (innerOrderPrintRequest innerOrderPrintRequest : mStockPrintEntities) {
+        for (InnerOrderPrintResponse InnerOrderPrintResponse : mStockPrintEntities) {
-            PdfPrintCountEntity pdfPrintCount = getCount(innerOrderQRCodeTextPDFTemplateRequest.getCountList(), innerOrderPrintRequest);
+            PdfPrintCountEntity pdfPrintCount = getCount(innerOrderQRCodeTextPDFTemplateRequest.getCountList(), InnerOrderPrintResponse);
             if (pdfPrintCount != null && pdfPrintCount.getRowCount() > 0) {
                 for (int i = 0; i < pdfPrintCount.getRowCount(); i++) {
-                    innerOrderPrintRequest clone = new innerOrderPrintRequest();
+                    InnerOrderPrintResponse clone = new InnerOrderPrintResponse();
-                    BeanUtils.copyProperties(innerOrderPrintRequest, clone);
+                    BeanUtils.copyProperties(InnerOrderPrintResponse, clone);
                     printEntities.add(clone);
                 }
             } else {
-                printEntities.add(innerOrderPrintRequest);
+                printEntities.add(InnerOrderPrintResponse);
             }
         }
 
         if (!FileUtils.isFileExist(dirPath + "/pdfprint")) {
             new File(dirPath + "/pdfprint").mkdirs();
         }
-        List<List<innerOrderPrintRequest>> splits = CustomUtil.splitList(printEntities, 100);
+        List<List<InnerOrderPrintResponse>> splits = CustomUtil.splitList(printEntities, 100);
         int index = 0;
         List<InvInnerOrderPdfTempEntity> stockPrintTempEntities = new ArrayList<>();
         for (int i = 0; i < splits.size(); i++) {
@@ -222,10 +219,10 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
 
         innerOrderPdfTempService.insertStockPrintTempList(stockPrintTempEntities);
 
-        for (innerOrderPrintRequest innerOrderPrintRequest : mStockPrintEntities) {
+        for (InnerOrderPrintResponse InnerOrderPrintResponse : mStockPrintEntities) {
             InvInnerOrderPrintEntity innerOrderPrintEntity = new InvInnerOrderPrintEntity();
             innerOrderPrintEntity.setStatus(ConstantStatus.PRINT_SUCCESS);
-            innerOrderPrintEntity.setId(innerOrderPrintRequest.getId());
+            innerOrderPrintEntity.setId(InnerOrderPrintResponse.getId());
             invInnerOrderPrintService.updateOrder(innerOrderPrintEntity);
         }
         PageInfo<InvInnerOrderPdfTempEntity> pageInfo;
@@ -237,9 +234,9 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
         return pageSimpleResponse;
     }
 
-    public PdfPrintCountEntity getCount(List<PdfPrintCountEntity> countList, innerOrderPrintRequest innerOrderPrintRequest) {
+    public PdfPrintCountEntity getCount(List<PdfPrintCountEntity> countList, InnerOrderPrintResponse InnerOrderPrintResponse) {
         for (PdfPrintCountEntity pdfPrintCount : countList) {
-            if (pdfPrintCount.getQueryId().equals(innerOrderPrintRequest.getId() + "")) {
+            if (pdfPrintCount.getQueryId().equals(InnerOrderPrintResponse.getId() + "")) {
                 return pdfPrintCount;
             }
         }
@@ -293,7 +290,7 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
             innerOrderPrintEntity.setUdiCode(udiCode);
             invInnerOrderPrintDao.insert(innerOrderPrintEntity);
         }
-        orderEntity.setInCodeStatus(1);//
+        orderEntity.setInCodeStatus(0);//
         orderService.update(orderEntity);
         return true;
     }

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

@@ -126,8 +126,7 @@
         , #{thrCheckEnable}, #{thrCheckWebNew}, #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims},
         #{thrCheckPc}
         , #{thrCheckSp}, #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}
-        , #{checkVailDate}, #{checkExpire}, #{checkCertExpire}
+        , #{checkVailDate}, #{checkExpire}, #{checkCertExpire})
-        )
     </insert>
 
     <select id="selectBusList" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
@@ -243,23 +242,58 @@
             <if test="action != ''and action != null">
                 AND basic_bussiness_type.action = #{action}
             </if>
-            <if test="enable != ''and enable != null">
+            <if test="enable != null">
                 AND basic_bussiness_type.enable = #{enable}
             </if>
-            <if test="spUse != ''and spUse != null">
+            <if test="spUse == 3">
+                AND basic_bussiness_type.spUse > 0
+            </if>
+            <if test="spUse != null and spUse != 3">
                 AND basic_bussiness_type.spUse = #{spUse}
             </if>
             <if test="code != ''and code != null">
                 AND subInvCode = #{code}
             </if>
+            <if test="invCode != ''and invCode != null">
+                AND subInvCode = #{code}
+            </if>
             <if test="userId != ''and userId != null">
                 AND auth_user_bustype.`userId` = #{userId}
             </if>
-            <if test="spUse != null">
+        </where>
+        group by basic_bussiness_type.action
+    </select>
+
+    <select id="filterJoinByInv" parameterType="com.glxp.api.req.basic.FilterBussinessTypeRequest"
+            resultType="com.glxp.api.res.basic.BasicBussinessTypeResponse">
+        SELECT basic_bussiness_type.*
+        FROM basic_bussiness_type
+        left JOIN auth_warehouse_bustype ON basic_bussiness_type.action = auth_warehouse_bustype.action
+        <where>
+            <if test="name != ''and name != null">
+                AND basic_bussiness_type.name LIKE concat('%', #{name}, '%')
+            </if>
+
+            <if test="inStock != null">
+                AND basic_bussiness_type.inStock = #{inStock}
+            </if>
+            <if test="action != ''and action != null">
+                AND basic_bussiness_type.action = #{action}
+            </if>
+            <if test="enable != null">
+                AND basic_bussiness_type.enable = #{enable}
+            </if>
+            <if test="spUse == 3">
+                AND basic_bussiness_type.spUse > 0
+            </if>
+            <if test="spUse != null and spUse != 3">
                 AND basic_bussiness_type.spUse = #{spUse}
             </if>
-            <if test="busType != null">
+            <if test="code != ''and code != null">
-                AND busType = #{busType}
+                AND auth_warehouse_bustype.code = #{code}
+            </if>
+            <if test="invCode != ''and invCode != null">
+                AND auth_warehouse_bustype.code = #{code}
             </if>
         </where>
         group by basic_bussiness_type.action
@@ -270,4 +304,19 @@
         from basic_bussiness_type
         where action = #{action}
     </select>
+
+    <select id="selectbyNotAction" parameterType="list"
+            resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
+        select *
+        from basic_bussiness_type
+        <where>
+            <if test="list != null and list.size()!=0">
+                and action not in
+                <foreach collection="list" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
 </mapper>

src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml

@@ -24,10 +24,10 @@
   </sql>
 
 
-
   <select id="filterOrderPrintList" parameterType="com.glxp.api.req.inv.FilterinnerOrderprintRequest"
           resultType="com.glxp.api.entity.inv.InvInnerOrderPrintEntity">
-    SELECT * FROM inv_inner_order_print
+    SELECT *
+    FROM inv_inner_order_print
     <where>
       <if test="orderIdFk != '' and orderIdFk != null">
         AND orderIdFk = #{orderIdFk}
@@ -35,18 +35,13 @@
       <if test="udiCode != '' and udiCode != null">
         AND udiCode = #{udiCode}
       </if>
-
-
-
     </where>
-
   </select>
 
 
   <select id="filterJoinInnerPrint" parameterType="com.glxp.api.req.inv.FilterinnerOrderprintRequest"
-          resultType="com.glxp.api.res.inv.innerOrderPrintRequest">
+          resultType="com.glxp.api.res.inv.InnerOrderPrintResponse">
-    SELECT
+    SELECT inv_inner_order_print.id,
-    inv_inner_order_print.id,
     inv_inner_order_print.udiCode,
     basic_products.nameCode,
     inv_inner_order_print.batchNo,
@@ -57,37 +52,12 @@
     basic_products.ylqxzcrbarmc,
     basic_products.zczbhhzbapzbh,
     basic_products.ggxh
-    FROM
+    FROM inv_inner_order_print
-    inv_inner_order_print
     LEFT JOIN basic_udirel ON inv_inner_order_print.productId = basic_udirel.id
     INNER JOIN basic_products ON basic_products.uuid = basic_udirel.uuid
     <where>
       <if test="nameCode != '' and nameCode != null">
-        AND inv_stockprint.nameCode = #{nameCode}
+        AND basic_products.nameCode = #{nameCode}
-      </if>
-      <if test="udiCode != '' and udiCode != null">
-        AND inv_stockprint.udiCode = #{udiCode}
-      </if>
-      <if test="printStatus != '' and printStatus != null">
-        AND printStatus = #{printStatus}
-      </if>
-      <if test="cpmctymc != '' and cpmctymc != null">
-        AND inv_stockprint.cpmctymc like concat('%',#{cpmctymc},'%')
-      </if>
-      <if test="thirdName != '' and thirdName != null">
-        AND inv_stockprint.thirdName like concat('%',#{thirdName},'%')
-      </if>
-      <if test="thirdId != '' and thirdId != null">
-        AND inv_stockprint.thirdId = #{thirdId}
-      </if>
-      <if test="thirdSysFk != '' and thirdSysFk != null">
-        AND inv_stockprint.thirdSysFk = #{thirdSysFk}
-      </if>
-      <if test="genKeyFk != '' and genKeyFk != null">
-        AND inv_stockprint.genKeyFk = #{genKeyFk}
-      </if>
-      <if test="sDetailId != '' and sDetailId != null">
-        AND inv_stockprint.sDetailId = #{sDetailId}
       </if>
       <if test="sOrderId != '' and sOrderId != null">
         AND inv_inner_order_print.orderIdFk = #{sOrderId}
@@ -95,11 +65,13 @@
       <if test="id != '' and id != null">
         AND inv_inner_order_print.id = #{id}
       </if>
+      <if test="orderIdFk != '' and orderIdFk != null">
+        AND orderIdFk = #{orderIdFk}
+      </if>
+      <if test="udiCode != '' and udiCode != null">
+        AND udiCode = #{udiCode}
+      </if>
       and diType = 1
-
     </where>
-
   </select>
-
-
 </mapper>