单据上传新增单据来源控制，其他一些问题修改

api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java

@@ -100,9 +100,11 @@ public class StockOrderDetailController {
         String value = systemParamConfigService.selectValueByParamKey("oeder_detail_by_code");
         List<StockOrderDetailEntity> stockOrderDetailEntityList
                 = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
-//        if (StrUtil.isNotEmpty(value) && value.equals("1")) {
+        BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
-//            stockOrderDetailEntityList = transferSerList(stockOrderDetailEntityList, stockOrderEntity.getOrderIdFk());
+        if (bussinessLocalTypeEntity.getOrderVisibleType() == 1 && (stockOrderEntity.getStatus().equals("4") || stockOrderEntity.getStatus().equals("5"))) {
-//        }
+            stockOrderDetailEntityList = transferSerList(stockOrderDetailEntityList, stockOrderEntity.getOrderIdFk());
+        }
+
 
         PageInfo<StockOrderDetailEntity> pageInfo;
         pageInfo = new PageInfo<>(stockOrderDetailEntityList);

api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.admin.annotation.AuthRuleAnnotation;
 import com.glxp.api.admin.constant.Constant;
+import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity;
 import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
 import com.glxp.api.admin.entity.business.StockOrderEntity;
 import com.glxp.api.admin.entity.business.StockOrderPrintEntity;
@@ -371,12 +372,13 @@ public class StockQRCodeTextController {
         systemPDFTemplateRelevanceRequest.setModuleId(stockQRCodeTextPDFTemplateRequest.getModuleId());
         systemPDFTemplateRelevanceRequest.setLocalAction(stockOrderEntity.getBillType());
 
+        BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
 
         List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest);
         if (systemPDFTemplateRelevanceResponses == null || systemPDFTemplateRelevanceResponses.size() < 1) return;
         SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = systemPDFTemplateRelevanceResponses.get(0);
 
-        if (systemPDFTemplateRelevanceResponse.getPrintType() == 0) {
+        if (bussinessLocalTypeEntity.getOrderVisibleType() == 0) {
             /*打印订单*/
             List<StockOrderPrintEntity> list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId());
             if (list != null && list.size() > 0) {
@@ -460,7 +462,8 @@ public class StockQRCodeTextController {
     }
 
 
-    public StockOrderDetailEntity getDetailByRelBatch(List<StockOrderDetailEntity> stockOrderDetailEntities, String relId, String batchNo) {
+    public StockOrderDetailEntity getDetailByRelBatch
+            (List<StockOrderDetailEntity> stockOrderDetailEntities, String relId, String batchNo) {
         for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntities) {
             if (StrUtil.trim(stockOrderDetailEntity.getBatchNo()).equals(StrUtil.trim(batchNo))
                     && StrUtil.trim(stockOrderDetailEntity.getRelId()).equals(StrUtil.trim(relId))

api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java

@@ -470,13 +470,14 @@ public class OrderDetailController {
         filterErpOrderRequest.setPage(1);
         filterErpOrderRequest.setLimit(100);
         List<ErpOrderEntity> erpOrderEntities = orderDetailService.filterMyErpOrder(filterErpOrderRequest);
-
+        OrderEntity orderEntity = orderService.findById(filterErpOrderRequest.getOrderId());
-        OrderEntity orderEntity = orderService.findById(filterErpOrderRequest.getOrderIdFk());
+        if (orderEntity == null) {
-
+            return ResultVOUtils.error(500, "单据不存在！");
-
+        }
-//        if (StrUtil.isNotEmpty(value) && value.equals("1")) {
+        BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
-//            erpOrderEntities = transferSerList(erpOrderEntities, filterErpOrderRequest.getOrderIdFk());
+        if (bussinessTypeEntity.getOrderVisibleType() == 1 && orderEntity.getStatus() == 4) {
-//        }
+            erpOrderEntities = transferSerList(erpOrderEntities, filterErpOrderRequest.getOrderId());
+        }
         if (CollUtil.isEmpty(erpOrderEntities)) {
             return spsDirectClient.downloadOrderDetail(filterErpOrderRequest.getOrderId(), customerService.getUserId() + "");
         }

api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessLocalTypeEntity.java

@@ -33,5 +33,7 @@ public class BussinessLocalTypeEntity {
     private boolean scanPreIn;
     private boolean vailInv;
     private boolean codeFillCheck;
+    private boolean supplementAll;      //是否全量补单 0:禁止补单，1：缺量补单，2。全量补单
+    private int orderVisibleType;   //订单详情展示方式：0：根据批次号展示，1:根据条码展示
 
 }

api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java

@@ -66,4 +66,8 @@ public class BussinessTypeEntity {
     private boolean codeFillCheck;
     private String defaultSubInv;
     private String defaultInv;
+
+    private int orderVisibleType;   //订单详情展示方式：0：根据批次号展示，1:根据条码展示
+
+    private boolean supplementAll;
 }

api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncUploadDataSetEntity.java

@@ -15,5 +15,13 @@ public class SyncUploadDataSetEntity {
     private boolean orderScanFinish;
 
 
+    private boolean checkUdims;
+    private boolean checkPdaEd;
+    private boolean checkPdaUn;
+    private boolean checkPc;
+    private boolean checkWebNew;
+    private boolean checkChange;
+    private boolean checkSp;
+    private boolean checkBalacne;
     private List<SyncDataBustypeEntity> busTypes;
 }

api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java

@@ -19,6 +19,8 @@ public class OrderEntity {
     private Integer status;
 
     private Integer fromType;
+
+    private Integer originFromType;
     private Integer contrastStatus;
     private String erpFk;
     private Integer signStatus;

api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java

@@ -69,4 +69,7 @@ public class BussinessTypResponse {
     private boolean codeFillCheck;
     private String defaultSubInv;
     private String defaultInv;
+
+    private int orderVisibleType;   //订单详情展示方式：0：根据批次号展示，1:根据条码展示
+    private boolean supplementAll;      //是否全量补单
 }

api-admin/src/main/java/com/glxp/api/admin/res/erp/UdiwmsWarehouseDetail.java

@@ -2,6 +2,8 @@ package com.glxp.api.admin.res.erp;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class UdiwmsWarehouseDetail {
 
@@ -13,4 +15,21 @@ public class UdiwmsWarehouseDetail {
 
     //备注
     private String remark;
+
+    private List<SubWarehouse> subWarehouses;
+
+    @Data
+    public static class SubWarehouse {
+        //货位号
+        private String code;
+
+        //货位名称
+        private String name;
+
+        //备注
+        private String remark;
+
+    }
+
+
 }

api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvWarehouseServiceImpl.java

@@ -1,9 +1,13 @@
 package com.glxp.api.admin.service.thrsys.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.admin.dao.basic.BasicThirdSysDao;
 import com.glxp.api.admin.dao.thrsys.ThrInvWarehouseDao;
 import com.glxp.api.admin.dao.thrsys.ThrSubInvWarehouseDao;
 import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity;
+import com.glxp.api.admin.entity.thrsys.ThrSubInvWarehouseEntity;
 import com.glxp.api.admin.httpclient.ErpBasicClient;
 import com.glxp.api.admin.req.erp.UdiwmsWarehouseRequest;
 import com.glxp.api.admin.req.thrsys.FilterThrInvWarehouseRequest;
@@ -136,6 +140,22 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService {
                     thrInvWarehouseEntity.setStatus(1);//默认启用
                     thrInvWarehouseEntity.setUpdateTime(new Date());
                     list.add(thrInvWarehouseEntity);
+
+                    List<UdiwmsWarehouseDetail.SubWarehouse> subWarehouseList = response.getSubWarehouses();
+                    if (CollUtil.isNotEmpty(subWarehouseList)) {
+                        for (UdiwmsWarehouseDetail.SubWarehouse subWarehouse : subWarehouseList) {
+                            ThrSubInvWarehouseEntity thrSubInvWarehouseEntity = new ThrSubInvWarehouseEntity();
+                            thrSubInvWarehouseEntity.setCode(subWarehouse.getCode());
+                            thrSubInvWarehouseEntity.setName(subWarehouse.getName());
+                            thrSubInvWarehouseEntity.setRemark(subWarehouse.getRemark());
+                            thrSubInvWarehouseEntity.setThirdSysFk(thirdSysFk);
+                            thrSubInvWarehouseEntity.setParentId(response.getCode());
+                            thrSubInvWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + "");
+                            thrSubInvWarehouseDao.insertThrInvWarehouse(thrSubInvWarehouseEntity);
+                        }
+                    }
+
+
                 }
                 //插入数据
                 thrInvWarehouseDao.insertInvWarehouses(list);

api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java

@@ -475,6 +475,7 @@ public class DlBasicService {
                                 OrderDao mapper = batchSession.getMapper(OrderDao.class);
                                 for (OrderEntity orderEntity : orderEntities) {
                                     orderEntity.setUpdateTime(null);
+                                    orderEntity.setOriginFromType(orderEntity.getFromType());
                                     orderEntity.setFromType(ConstantStatus.FROM_UDISP);
                                     orderEntity.setReceiveStatus(0);
                                     orderEntity.setErpFk(null);

api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java

@@ -262,11 +262,10 @@ public class InvProductsTrService {
         List<WarehouseEntity> inList = new ArrayList<>();
         List<WarehouseEntity> preiInList = new ArrayList<>();
         //缺量补单时是否全量补单
-        SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("ullage_supplement_all");
+        BussinessTypeEntity bussinessTypeEntity1 = bussinessTypeService.findBTByAction(orderEntity.getAction());
-        if (systemParamConfigEntity != null && systemParamConfigEntity.getParamValue().equals("1")) {
+//        SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("ullage_supplement_all");
-
+        if (bussinessTypeEntity1.isSupplementAll()) {
-            BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
+            insetInv(bussinessTypeEntity1, invProductDetailEntities);//2.插入当前库存
-            insetInv(bussinessTypeEntity, invProductDetailEntities);//2.插入当前库存
             WarehouseEntity warehouseEntity = warehouseEntities.get(0);
             InvWarehouseEntity locWarehouseEntity = invWarehouseService.selectByCode(warehouseEntity.getLocStorageCode());
             if (locWarehouseEntity.getLevel() == 1 && isAdavnce(warehouseEntity)) {//补寄售转入

api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java

@@ -117,6 +117,47 @@ public class OrderSubmitTask implements SchedulingConfigurer {
                             for (String orderId : orderIds) {
 
                                 StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(orderId);
+                                OrderEntity orderEntity = orderService.findById(stockOrderEntity.getOrderIdFk());
+
+                                if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) {
+                                    orderEntity.setFromType(orderEntity.getOriginFromType());
+                                }
+
+                                if (orderEntity.getFromType() == ConstantStatus.FROM_UDIMS) {
+                                    if (!syncUploadDataSetEntity.isCheckUdims()) {
+                                        continue;
+                                    }
+                                }
+                                if (orderEntity.getFromType() == ConstantStatus.FROM_WEBNEW) {
+                                    if (!syncUploadDataSetEntity.isCheckWebNew()) {
+                                        continue;
+                                    }
+                                }
+                                if (orderEntity.getFromType() == ConstantStatus.FROM_PDAED) {
+                                    if (!syncUploadDataSetEntity.isCheckPdaEd()) {
+                                        continue;
+                                    }
+                                }
+                                if (orderEntity.getFromType() == ConstantStatus.FROM_PDAUN) {
+                                    if (!syncUploadDataSetEntity.isCheckPdaUn()) {
+                                        continue;
+                                    }
+                                }
+                                if (orderEntity.getFromType() == ConstantStatus.FROM_PC) {
+                                    if (!syncUploadDataSetEntity.isCheckPc()) {
+                                        continue;
+                                    }
+                                }
+                                if (orderEntity.getFromType() == ConstantStatus.FROM_CHANGE) {
+                                    if (!syncUploadDataSetEntity.isCheckChange()) {
+                                        continue;
+                                    }
+                                }
+                                if (orderEntity.getFromType() == ConstantStatus.FROM_PEACE_CHANGE) {
+                                    if (!syncUploadDataSetEntity.isCheckBalacne()) {
+                                        continue;
+                                    }
+                                }
                                 BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
 
                                 if (stockOrderEntity.getStatus() == ConstantStatus.SORDER_DELIVER) {

api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml

@@ -76,6 +76,7 @@
         basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction
         ,basic_bussiness_type.prefix,basic_bustype_local.prefix localPrefix,basic_bustype_local.preIn,
         basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv, basic_bussiness_type.codeFillCheck
+        ,  basic_bustype_local.supplementAll,basic_bussiness_type.orderVisibleType
         FROM basic_bustype_local
         inner join basic_bussiness_type
         on basic_bustype_local.action = basic_bussiness_type.localAction
@@ -129,7 +130,7 @@
         basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction,
         basic_bussiness_type.defaultUnit,basic_bussiness_type.genUnit,basic_bustype_origin.action
         thirdAction,basic_bustype_origin.thirdSys,basic_bussiness_type.prefix,basic_bustype_local.prefix localPrefix,preIn,
-        basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv, basic_bussiness_type.codeFillCheck
+        basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv, basic_bussiness_type.codeFillCheck,supplementAll
         FROM basic_bustype_local
         inner join basic_bussiness_type on basic_bustype_local.action = basic_bussiness_type.localAction
         INNER JOIN inv_warehouse_bussiness_type on basic_bussiness_type.action = inv_warehouse_bussiness_type.action
@@ -168,7 +169,7 @@
         basic_bussiness_type.name ,
         basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable,
         basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction
-        ,basic_bussiness_type.prefix,basic_bustype_local.prefix localPrefix,preIn
+        ,basic_bussiness_type.prefix,basic_bustype_local.prefix localPrefix,preIn,supplementAll
         FROM basic_bustype_local
         LEFT JOIN basic_bussiness_type on basic_bussiness_type.localAction = basic_bustype_local.action
         <where>
@@ -188,10 +189,10 @@
     <insert id="insertBussinessType" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
         replace INTO basic_bustype_local
-            (action, name, remark, originAction, advanceType, changeEnable, spUse,updateTime,prefix,preIn)
+            (action, name, remark, originAction, advanceType, changeEnable, spUse,updateTime,prefix,preIn,supplementAll)
         values (#{action},
         #{name},
-        #{remark}, #{originAction}, #{advanceType}, #{changeEnable}, #{spUse},#{updateTime},#{prefix},#{preIn})
+        #{remark}, #{originAction}, #{advanceType}, #{changeEnable}, #{spUse},#{updateTime},#{prefix},#{preIn},#{supplementAll})
     </insert>
 
     <update id="updateBusLocalType" parameterType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
@@ -207,6 +208,7 @@
             <if test="updateTime != null">updateTime = #{updateTime},</if>
             <if test="prefix != null">prefix = #{prefix},</if>
             <if test="preIn != null">preIn = #{preIn},</if>
+            <if test="supplementAll != null">supplementAll = #{supplementAll},</if>
 
         </trim>
         WHERE id = #{id}

api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml

@@ -20,7 +20,7 @@
         basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne,
         basic_bussiness_type.secCheckBalacne, defaultUnit,basic_bustype_origin.action
         thirdAction,basic_bustype_origin.thirdSys,basic_bussiness_type.useDyCount,basic_bussiness_type.expireTip,basic_bussiness_type.prefix,basic_bustype_local.prefix
-        localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv
+        localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv,orderVisibleType,supplementAll
         FROM basic_bussiness_type LEFT JOIN basic_bustype_local
         on basic_bussiness_type.localAction = basic_bustype_local.action
         left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action
@@ -83,7 +83,7 @@
         basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType,
         basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder,defaultUnit,
         basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.expireTip,
-        basic_bustype_local.prefix localPrefix ,basic_bustype_local.preIn from
+        basic_bustype_local.prefix localPrefix ,basic_bustype_local.preIn,orderVisibleType,supplementAll from
         basic_bussiness_type LEFT JOIN
         basic_third_sys on basic_bussiness_type.thirdSysFk =
         basic_third_sys.thirdId LEFT JOIN basic_bustype_local on basic_bussiness_type.localAction =
@@ -125,9 +125,9 @@
         basic_bussiness_type.enable,basic_bussiness_type.remark,basic_bussiness_type.mainAction,
         basic_bussiness_type.thirdSysFk,basic_bussiness_type.localAction,basic_bussiness_type.secCheckEnable,
         basic_bussiness_type.checkUdims,basic_bussiness_type.checkPdaEd,basic_bussiness_type.checkPdaUn,
-               basic_bussiness_type.checkPc,
+        basic_bussiness_type.checkPc,
         basic_bussiness_type.checkWebNew,basic_bussiness_type.checkChange,basic_bussiness_type.entrutSpms,
-               basic_bussiness_type.codeFillCheck,
+        basic_bussiness_type.codeFillCheck,
         basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckPdaEd, basic_bussiness_type.secCheckPdaUn,
         basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange,basic_bussiness_type.outTospms,
         basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv,
@@ -136,8 +136,8 @@
         basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne,defaultUnit,
         basic_bussiness_type.secCheckBalacne,basic_bustype_origin.action
         thirdAction,basic_bustype_origin.thirdSys,useDyCount,basic_bussiness_type.expireTip,
-               basic_bussiness_type.prefix,basic_bustype_local.prefix
+        basic_bussiness_type.prefix,basic_bustype_local.prefix
-        localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv
+        localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv,orderVisibleType,supplementAll
         FROM basic_bussiness_type LEFT JOIN basic_bustype_local
         on basic_bussiness_type.localAction = basic_bustype_local.action
         left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action
@@ -191,7 +191,7 @@
         ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,
         secCheckChange,corpType,basic_bussiness_type.storageCode,checkBalacne,
         secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix
-        ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,outTospms,entrutSpms,defaultInv)
+        ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,outTospms,entrutSpms,defaultInv,orderVisibleType)
         values
             (
         #{action},
@@ -229,7 +229,13 @@
         #{prefix},
         #{ullageFill},
         #{scanPreIn},
-        #{vailInv},#{codeFillCheck},#{defaultSubInv},#{outTospms},#{entrutSpms},#{defaultInv}
+        #{vailInv},
+        #{codeFillCheck},
+        #{defaultSubInv},
+        #{outTospms},
+        #{entrutSpms},
+        #{defaultInv},
+        #{orderVisibleType}
         )
     </insert>
 
@@ -244,7 +250,7 @@
         checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange
         ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,
         secCheckChange,corpType,storageCode,checkBalacne,secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix
-        ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,outTospms,entrutSpms,defaultInv)
+        ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,outTospms,entrutSpms,defaultInv,orderVisibleType)
         values
             (
         #{index},
@@ -283,7 +289,13 @@
         #{prefix},
         #{ullageFill},
         #{scanPreIn},
-        #{vailInv},#{codeFillCheck},#{defaultSubInv},#{outTospms},#{entrutSpms},#{defaultInv}
+        #{vailInv},
+        #{codeFillCheck},
+        #{defaultSubInv},
+        #{outTospms},
+        #{entrutSpms},
+        #{defaultInv},
+        #{orderVisibleType}
         )
     </insert>
 
@@ -332,7 +344,11 @@
             <if test="defaultInv != null">defaultInv=#{defaultInv},</if>
 
             <if test="outTospms != null">outTospms=#{outTospms},
-                <if test="entrutSpms != null">entrutSpms=#{entrutSpms},</if></if>
+            </if>
+
+            <if test="entrutSpms != null">entrutSpms=#{entrutSpms},</if>
+            <if test="orderVisibleType != null">orderVisibleType=#{orderVisibleType},</if>
+
             thirdSysFk=#{thirdSysFk},
         </trim>
         WHERE id = #{id}

api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataSetDao.xml

@@ -13,14 +13,24 @@
 
     <insert id="insert" parameterType="com.glxp.api.admin.entity.info.SyncUploadDataSetEntity">
         replace
-        INTO thr_order_upload(id,autoUpload, orderSyncTime,orderUnCheck,orderUnReceive,orderScanFinish)
+        INTO thr_order_upload(id,autoUpload, orderSyncTime,orderUnCheck,orderUnReceive,
+            orderScanFinish, checkUdims, checkPdaEd, checkPdaUn, checkPc,
+        checkWebNew, checkChange, checkSp,checkBalacne)
         values (
         #{id},
         #{autoUpload},
         #{orderSyncTime},
         #{orderUnCheck},
         #{orderUnReceive},
-        #{orderScanFinish}
+        #{orderScanFinish},
+        #{checkUdims},
+        #{checkPdaEd},
+        #{checkPdaUn},
+        #{checkPc},
+        #{checkWebNew},
+        #{checkChange},
+        #{checkSp},
+        #{checkBalacne}
         )
     </insert>
 

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -34,7 +34,7 @@
                              receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId,
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
                              outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
-                             fromSubInvCode, createTime)
+                             fromSubInvCode, createTime, originFromType)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -54,7 +54,7 @@
                 #{stockCheckFk},
                 #{thirdBillNo}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo},
                 #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck},
-                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime})
+                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{originFromType})
     </insert>
 
     <insert id="importOrder" keyProperty="id" parameterType="com.glxp.api.admin.entity.inout.OrderEntity">
@@ -64,7 +64,7 @@
                               fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
                               receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId,
                               exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
-                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime)
+                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,originFromType)
         values (
         #{id},
         #{action},
@@ -97,7 +97,9 @@
         #{updateTime},
         #{replicateNo},
         #{invWarehouseCode},
-        #{fromSubInvCode},#{createTime}
+        #{fromSubInvCode},
+        #{createTime},
+        #{originFromType}
         )
     </insert>
 
@@ -139,6 +141,7 @@
             <if test="replicateNo != null and replicateNo != ''">replicateNo=#{replicateNo},</if>
             <if test="fromSubInvCode != null and fromSubInvCode != ''">fromSubInvCode=#{fromSubInvCode},</if>
             <if test="createTime != null and createTime != ''">createTime=#{createTime},</if>
+            <if test="originFromType != null and originFromType != ''">originFromType=#{originFromType},</if>
 
         </trim>
         WHERE id = #{id}
@@ -191,7 +194,8 @@
 
     <select id="filterListOr" parameterType="com.glxp.api.admin.req.inout.OrderFilterRequest"
             resultType="com.glxp.api.admin.entity.inout.OrderEntity">
-        SELECT io_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bussiness_type.name billTypeName FROM io_order
+        SELECT io_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bussiness_type.name billTypeName FROM
+        io_order
         left join basic_bussiness_type on io_order.action = basic_bussiness_type.action
         LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_sub iws ON io_order.invWarehouseCode = iws.`code`