单据类型修改

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

@@ -198,7 +198,7 @@ public class ConstantStatus {
     public static final int FROM_PDAUN = 4;     //pda未校验
     public static final int FROM_PC = 5;        //pc端扫码精灵
     public static final int FROM_CHANGE = 6;       //单据流转
-    public static final int FROM_UDISP = 7;      //供应商平台
+    public static final int FROM_UDISP = 7;      //供应商平台||UDI管理系统
     public static final int FROM_PEACE_CHANGE = 8;       //平衡补单
     public static final int FROM_REVIEW = 9;       //单据验收直接补单
     public static final int FROM_COPY = 10;           //单据复制

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

@@ -165,7 +165,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);
@@ -191,7 +191,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

@@ -9,6 +9,7 @@ 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.constant.ConstantType;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.req.basic.BusNoUserRequest;
@@ -366,4 +367,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/entity/inout/IoOrderEntity.java

@@ -226,4 +226,9 @@ public class IoOrderEntity {
     @TableField(value = "inCodeStatus")
     private int inCodeStatus;     //内部码生成状态
 
+    @TableField(value = "relKey")
+    private String relKey;      //关联单据唯一键
+    @TableField(value = "suppleCount")
+    private Integer suppleCount; //补单次数
+
 }

src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java

@@ -176,5 +176,6 @@ public class FilterOrderRequest extends ListPageRequest {
 
     private Integer busType;
     private Integer inCodeStatus;
+    private String relKey;
 
 }

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -1,6 +1,7 @@
 package com.glxp.api.res.inout;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.util.Date;
@@ -229,6 +230,9 @@ public class IoOrderResponse {
 
     private Integer busType;           //1:正常；2：送货；3.到货
 
+    private String relKey;      //关联单据唯一键
+    private Integer suppleCount; //补单次数
+
 
     public String getFromName() {
 

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

@@ -240,7 +240,7 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService
             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", 0).eq("enable", true));
+                        .gt("spUse", 1).eq("enable", true));
                 break;
 
             case Constant.ORDER_ACTION_SUP_INOUT:        //供应商查询出入库单

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -49,6 +49,11 @@
             <if test="inCodeStatus != null">
                 AND inCodeStatus = #{inCodeStatus}
             </if>
+
+            <if test="relKey != null">
+                AND relKey = #{relKey}
+            </if>
+
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
             </if>

src/main/resources/schemas/schema_v2.1.sql

@@ -6,6 +6,9 @@ CALL Pro_Temp_ColumnWork('io_order', 'busType', 'tinyint ', 1);
 CALL Pro_Temp_ColumnWork('io_order', 'deliveryStatus', 'tinyint ', 1);
 CALL Pro_Temp_ColumnWork('io_order', 'inCodeStatus', 'tinyint ', 1);
 CALL Pro_Temp_ColumnWork('io_order', 'processStatus', 'tinyint ', 1);
+
+CALL Pro_Temp_ColumnWork('io_order', 'suppleCount', 'tinyint ', 1);
+
 CALL Pro_Temp_ColumnWork('io_code_lost', 'nameCode', 'varchar(255) ', 1);
 
 CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'thirdSysName', 'varchar(255) ', 3);