送货单，单据类型相关修改

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

@@ -21,6 +21,8 @@ public class Constant {
     public static final String TH_ORDER = "TH";     //退货
 
 
+
+
     /**
      * 盘点单据前缀
      */
@@ -207,5 +209,11 @@ public class Constant {
      */
     public static final String ORDER_STATUS_AUDITED = "audited";
 
+    /**
+     * 单据-供应商已审核
+     */
+
+    public static final String ORDER_STATUS_SUP_SEARCH = "supSearch";
+
 
 }

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

@@ -60,6 +60,13 @@ public class ConstantStatus {
     public static final Integer ORDER_TYPE_SCAN = 2;
     public static final Integer ORDER_TYPE_NORMAL = 3;
 
+    /**
+     * 供应商自助平台单据类型
+     */
+    public static final Integer BUS_TYPE_NORMAL = 1;  //正常出入库单据（入账）
+    public static final Integer BUS_TYPE_DELIVERY = 2;    //送货出入库单据
+    public static final Integer BUS_TYPE__ARRIVAL = 3;  //到货出库单据类型
+
 
     public static final Integer ORDER_STATUS_ADDITIONAL = 5;    //补录单据
 //    public static final Integer ORDER_STATUS_RECEIVEED = 7;
@@ -242,5 +249,4 @@ public class ConstantStatus {
     public static final int PRINT_SUCCESS = 1; //已打印
 
 
-
 }

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

@@ -633,6 +633,7 @@ public class IoCodeTempController extends BaseController {
                 orderEntity.setDeptCode(invWarehouseEntity.getParentId());
                 orderEntity.setInvCode(addOrderRequest.getInvCode());
                 orderEntity.setOrderType(addOrderRequest.getOrderType());
+                orderEntity.setBusType(bussinessTypeEntity.getBusType());
                 orderService.insertOrder(orderEntity);
             }
 

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

@@ -125,6 +125,7 @@ public class IoOrderDetailBizController extends BaseController {
             orderEntity.setCustomerId(authAdmin.getCustomerId() + "");
             orderEntity.setDeptCode(invWarehouseEntity.getParentId());
             orderEntity.setInvCode(orderEntity.getInvCode());
+            orderEntity.setBusType(bussinessTypeEntity.getBusType());
             orderService.insertOrder(orderEntity);
         }
 
@@ -242,6 +243,7 @@ public class IoOrderDetailBizController extends BaseController {
         orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT);
         orderEntity.setFromType(ConstantStatus.FROM_THRORDER);
         orderEntity.setOrderType(ConstantStatus.ORDER_TYPE_BIZ);
+        orderEntity.setBusType(bussinessTypeEntity.getBusType());
         orderService.insertOrder(orderEntity);
 
         for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
@@ -340,6 +342,7 @@ public class IoOrderDetailBizController extends BaseController {
         orderEntity.setOrderType(ConstantStatus.ORDER_TYPE_BIZ);
         orderEntity.setFromDeptCode(purReceiveEntity.getDeptCode());
         orderEntity.setFromInvCode(purReceiveEntity.getInvCode());
+        orderEntity.setBusType(bussinessTypeEntity.getBusType());
         orderService.insertOrder(orderEntity);
         for (PurReceiveDetailEntity purReceiveDetailEntity : purReceiveDetailEntities) {
             IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();

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

@@ -244,6 +244,7 @@ public class IoOrderReviewController extends BaseController {
         supplementOrder.setFromType(ConstantStatus.FROM_REVIEW);
         supplementOrder.setMainAction(bussinessTypeEntity.getMainAction());
         supplementOrder.setAction(bussinessTypeEntity.getAction());
+        orderEntity.setBusType(bussinessTypeEntity.getBusType());
         //复制码表
         List<IoCodeTempEntity> supplementCodes = new ArrayList<>();
         warehouseEntities.forEach(

src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java

@@ -354,4 +354,8 @@ public class BasicBussinessTypeEntity {
     @TableField(value = "vailGroupBuy")
     private int vailGroupBuy;            //校验是否集采产品  0:全部，1：只采集集采产品，2：只采集非集采产品
 
+
+    @TableField(value = "busType")
+    private Integer busType;           //1:正常；2：送货；3.到货
+
 }

src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java

@@ -213,4 +213,8 @@ public class IoOrderEntity {
     @TableField(value = "exportStatus")
     private Integer exportStatus;
 
+
+    @TableField(value = "busType")
+    private Integer busType;           //1:正常；2：送货；3.到货
+
 }

src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java

@@ -103,5 +103,6 @@ public class FilterBussinessTypeRequest extends ListPageRequest {
      */
     private Boolean preIn;
 
+    private Integer busType;
 
 }

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

@@ -146,4 +146,6 @@ public class FilterOrderRequest extends ListPageRequest {
 
     private String corpName;
 
+    private Integer busType;
+
 }

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

@@ -46,4 +46,6 @@ public class FilterUploadOrderRequest extends ListPageRequest {
      */
     private String submitStatus;
 
+    private Integer busType;
+
 }

src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java

@@ -126,5 +126,7 @@ public class BasicBussinessTypeResponse {
     private boolean vailDispatch;       //校验是否可配送
     private int vailGroupBuy;            //校验是否集采产品  0:全部，1：只采集集采产品，2：只采集非集采产品
 
+    private Integer busType;           //1:正常；2：送货；3.到货
+
 
 }

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

@@ -222,6 +222,9 @@ public class IoOrderResponse {
     private String errMsg;
 
 
+    private Integer busType;           //1:正常；2：送货；3.到货
+
+
     public String getFromName() {
 
         if (StrUtil.isNotEmpty(fromCorpName))

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

@@ -356,7 +356,7 @@ public class IoAddInoutService {
         BasicBussinessTypeEntity supplementType = basicBussinessTypeService.findByAction(bussinessTypeEntity.getSupplementOrderType());
         supplementOrder.setMainAction(supplementType.getMainAction());
         supplementOrder.setAction(supplementType.getAction());
-
+        supplementOrder.setBusType(supplementType.getBusType());
         //复制码表
         List<IoCodeEntity> codes = codeService.findByOrderId(orderId);
         List<IoCodeTempEntity> supplementCodes = new ArrayList<>();
@@ -448,6 +448,7 @@ public class IoAddInoutService {
                     orderSaveRequest.setCreateUser(postOrderRequest.getUserId() + "");
                     orderSaveRequest.setUpdateUser(postOrderRequest.getUserId() + "");
                     orderSaveRequest.setUpdateTime(new Date());
+                    orderSaveRequest.setBusType(bussinessTypeEntity.getBusType());
                     orderSaveRequest.setOrderType(ConstantStatus.ORDER_TYPE_SCAN);
                     if (postOrder.getErpOrders() != null && postOrder.getErpOrders().size() > 0)
                         orderSaveRequest.setFromType(ConstantStatus.FROM_PDAED);

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

@@ -126,6 +126,7 @@ public class IoGenInvService {
     @Resource
     InvPreProductDetailService invPreProductDetailService;
 
+    //生成寄售库存
     public void genPreInv(String orderId) {
         IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
         List<IoOrderDetailResultEntity> orderDetailResultEntities = orderDetailResultService.findByOrderId(orderId);
@@ -280,7 +281,7 @@ public class IoGenInvService {
                 outOrder.setCreateTime(DateUtil.fromDate(orderEntity));
             outOrder.setAction(targetBustypeEntity.getAction());
             outOrder.setMainAction(targetBustypeEntity.getMainAction());
-
+            outOrder.setBusType(targetBustypeEntity.getBusType());
             outOrder.setFromType(ConstantStatus.FROM_CHANGE);
             String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(targetBustypeEntity.getPrefix()), "yyyyMMdd"));
             outOrder.setBillNo(orderNo);

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

@@ -528,6 +528,10 @@ public class IoOrderServiceImpl implements IoOrderService {
                 filterOrderRequest.setStatuses(Arrays.asList(7));
                 filterOrderRequest.setDealStatuses(Arrays.asList(3));
                 break;
+            case Constant.ORDER_STATUS_SUP_SEARCH:
+                filterOrderRequest.setStatuses(Arrays.asList(5, 7));
+                filterOrderRequest.setDealStatuses(Arrays.asList(2, 3));
+                break;
             default:
                 break;
         }

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_spms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_spms_ljy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: Glxp@6066
     hikari:

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

@@ -33,6 +33,9 @@
             <if test="secCheckEnable != null">
                 AND bu.secCheckEnable = #{secCheckEnable}
             </if>
+            <if test="busType != null">
+                AND bu.busType = #{busType}
+            </if>
             <if test="preIn != null">
                 AND bu.preIn = #{preIn}
             </if>
@@ -65,7 +68,7 @@
                                    entrutSpms, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType,
                                    checkCopy, secCheckCopy, originAction, advanceType, changeEnable,
                                    spUse, preIn, supplementAll, createUser, createTime, preInBack, vailDispatch,
-                                   vailGroupBuy)
+                                   vailGroupBuy, busType)
         values (#{mainAction},
                 #{action},
                 #{name},
@@ -117,7 +120,7 @@
                 #{preIn},
                 #{supplementAll},
                 #{createUser},
-                #{createTime}, #{preInBack}, #{vailDispatch}, #{vailGroupBuy})
+                #{createTime}, #{preInBack}, #{vailDispatch}, #{vailGroupBuy}，#{busType})
     </insert>
 
     <select id="selectBusList" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
@@ -154,6 +157,10 @@
             <if test="preIn != null">
                 AND bu.preIn = #{preIn}
             </if>
+            <if test="busType != null">
+                AND bu.busType = #{busType}
+            </if>
+
             <if test="actionList != null and actionList.size() != 0">
                 AND bu.action in
                 <foreach collection="actionList" index="index" item="item" separator="," open="(" close=")">
@@ -209,6 +216,9 @@
             <if test="userId != null">
                 AND auth_user_bustype.userId = #{userId}
             </if>
+            <if test="busType != null">
+                AND busType = #{busType}
+            </if>
         </where>
         group by basic_bussiness_type.action
     </select>
@@ -240,6 +250,9 @@
             <if test="spUse != null">
                 AND basic_bussiness_type.spUse = #{spUse}
             </if>
+            <if test="busType != null">
+                AND busType = #{busType}
+            </if>
         </where>
         group by basic_bussiness_type.action
     </select>

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

@@ -19,7 +19,8 @@
                 AND id = #{id}
             </if>
             <if test="corpName != null and corpName != ''">
-                AND ( SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode ) like concat('%', #{corpName}, '%')
+                AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like
+                    concat('%', #{corpName}, '%')
             </if>
             <if test="action != null and action != ''">
                 AND action = #{action}
@@ -42,6 +43,9 @@
             <if test="invCode != null and invCode != ''">
                 AND invCode = #{invCode}
             </if>
+            <if test="busType != null">
+                AND busType = #{busType}
+            </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>
@@ -116,6 +120,9 @@
             <if test="syncStatus != null">
                 AND syncStatus = #{syncStatus}
             </if>
+            <if test="busType != null">
+                AND busType = #{busType}
+            </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>
@@ -138,7 +145,7 @@
                            FROM basic_bussiness_type
                            WHERE supplementOrderType IS NOT NULL
                               OR supplementOrderType
-                               != '')
+                                   != '')
     </select>
 
     <select id="selectBillNos" resultType="com.glxp.api.res.inout.OrderNoResult">
@@ -149,16 +156,16 @@
 
     <select id="selectUploadOrder" resultType="com.glxp.api.res.inout.IoOrderResponse">
         select io.*,
-        (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName,
+               (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName,
-        (select name from auth_dept ad where ad.code = io.deptCode)              deptName,
+               (select name from auth_dept ad where ad.code = io.deptCode)              deptName,
-        (select name from auth_warehouse aw where aw.code = io.invCode)          invName,
+               (select name from auth_warehouse aw where aw.code = io.invCode)          invName,
-        (select employeeName from auth_user au where au.id = io.createUser)      createUserName,
+               (select employeeName from auth_user au where au.id = io.createUser)      createUserName,
-        (select employeeName from auth_user au2 where au2.id = io.updateUser)    updateUserName,
+               (select employeeName from auth_user au2 where au2.id = io.updateUser)    updateUserName,
-        (select employeeName from auth_user au3 where au3.id = io.reviewUser)    reviewUserName,
+               (select employeeName from auth_user au3 where au3.id = io.reviewUser)    reviewUserName,
-        (select name from auth_dept ad2 where ad2.code = io.fromDeptCode)        fromDeptName,
+               (select name from auth_dept ad2 where ad2.code = io.fromDeptCode)        fromDeptName,
-        (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode)    fromInvName,
+               (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode)    fromInvName,
-        (select name from basic_corp bc where bc.erpId = io.fromCorp)            fromCorpName,
+               (select name from basic_corp bc where bc.erpId = io.fromCorp)            fromCorpName,
-        (select name from basic_corp bc where bc.erpId = io.customerId)          customerName
+               (select name from basic_corp bc where bc.erpId = io.customerId)          customerName
         from io_order as io
         <where>
             io.dealStatus = 3
@@ -189,11 +196,16 @@
             <if test="submitStatus != null and submitStatus != ''">
                 AND exportStatus = #{submitStatus}
             </if>
+            <if test="busType != null">
+                AND busType = #{busType}
+            </if>
         </where>
         order by io.updateTime desc
     </select>
 
     <select id="selectActionByBillNo" resultType="java.lang.String">
-        select action from io_order where billNo = #{billNo}
+        select action
+        from io_order
+        where billNo = #{billNo}
     </select>
 </mapper>

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

@@ -2,6 +2,7 @@
 CALL Pro_Temp_ColumnWork('io_order', 'fromReceiveBillNo', 'varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork('io_order', 'fromThrBillNo', 'varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork('io_order', 'syncStatus', 'tinyint ', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'busType', 'tinyint ', 1);
 
 CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'thirdSysName', 'varchar(255) ', 3);
 CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'thirdBuyName', 'varchar(255) ', 3);
@@ -20,6 +21,7 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'groupBuy', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_udirel', 'isDateBy', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailDispatch', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailGroupBuy', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'busType', 'tinyint', 1);
 
 
 CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'batchNo', 'varchar(255) ', 1);