Merge branch 'fengcang' into busUser

# Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java
#	api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java
#	api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml
#	api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
#	api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

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

@@ -110,6 +110,7 @@ public class ConstantStatus {
     public static final int FROM_CHANGE = 6;       //单据流转
     public static final int FROM_UDISP = 7;      //供应商平台
     public static final int FROM_PEACE_CHANGE = 8;       //平衡补单
+    public static final int FROM_COPY = 10;           //单据复制
 
 
     //DI类型

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

@@ -434,6 +434,7 @@ public class StockOrderController {
         originOrder.setReceiveStatus(0); //设置验收状态为未验收
         originOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
         originOrder.setErpFk(null);//关联业务单据置空
+        originOrder.setFromType(ConstantStatus.FROM_COPY);
         originOrder.setLocStorageCode(addStockOrderChangeRequest.getLocStorageCode());
         BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(originOrder.getAction());
         String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd"));

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

@@ -13,6 +13,7 @@ import com.glxp.api.admin.entity.business.StockQRCodeTextEntity;
 import com.glxp.api.admin.entity.info.CompanyEntity;
 import com.glxp.api.admin.entity.info.SystemPDFModuleEntity;
 import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity;
+import com.glxp.api.admin.entity.inout.OrderEntity;
 import com.glxp.api.admin.entity.inventory.StockPrintEntity;
 import com.glxp.api.admin.entity.inventory.StockPrintTempEntity;
 import com.glxp.api.admin.req.basic.FilterStockprintRequest;
@@ -37,6 +38,7 @@ import com.glxp.api.admin.service.business.StockOrderDetailTempService;
 import com.glxp.api.admin.service.business.StockOrderService;
 import com.glxp.api.admin.service.business.StockQRCodeTextService;
 import com.glxp.api.admin.service.info.*;
+import com.glxp.api.admin.service.inout.OrderService;
 import com.glxp.api.admin.service.inventory.InvStockPrintService;
 import com.glxp.api.admin.service.inventory.StockPrintTempService;
 import com.glxp.api.admin.thread.IoTransInoutService;
@@ -67,6 +69,8 @@ public class StockQRCodeTextController {
     @Resource
     StockOrderService stockOrderService;
     @Resource
+    OrderService orderService;
+    @Resource
     StockOrderDetailService stockOrderDetailService;
     @Resource
     StockQRCodeTextService stockQRCodeTextService;
@@ -375,6 +379,7 @@ public class StockQRCodeTextController {
         systemPDFTemplateRelevanceRequest.setModuleId(stockQRCodeTextPDFTemplateRequest.getModuleId());
         systemPDFTemplateRelevanceRequest.setLocalAction(stockOrderEntity.getBillType());
         BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
+        OrderEntity orderEntity = orderService.findById(stockOrderEntity.getOrderIdFk());
 
         List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest);
         if (systemPDFTemplateRelevanceResponses == null || systemPDFTemplateRelevanceResponses.size() < 1) return;
@@ -403,6 +408,7 @@ public class StockQRCodeTextController {
                     stockOrderPrintEntity.setRemark1(systemPDFModuleEntity.getRemark1());
                     stockOrderPrintEntity.setRemark2(systemPDFModuleEntity.getRemark2());
                     stockOrderPrintEntity.setRemark3(systemPDFModuleEntity.getRemark3());
+                    stockOrderPrintEntity.setBillRemark(orderEntity.getPrintRemark());
                     index++;
                 }
 
@@ -429,6 +435,7 @@ public class StockQRCodeTextController {
                 systemPDFModuleEntity.setRemark2(systemPDFTemplateRelevanceResponse.getRemark2());
                 systemPDFModuleEntity.setRemark3(systemPDFTemplateRelevanceResponse.getRemark3());
 
+
                 if (systemPDFTemplateEntity == null) return;
 
                 int index = 1;
@@ -442,6 +449,8 @@ public class StockQRCodeTextController {
                     stockOrderPrintEntity.setRemark1(systemPDFModuleEntity.getRemark1());
                     stockOrderPrintEntity.setRemark2(systemPDFModuleEntity.getRemark2());
                     stockOrderPrintEntity.setRemark3(systemPDFModuleEntity.getRemark3());
+
+                    stockOrderPrintEntity.setBillRemark(orderEntity.getPrintRemark());
                     StockOrderDetailEntity stockOrderDetailEntity = getDetailByRelBatch(stockOrderDetailEntities, stockOrderPrintEntity.getProductId(), stockOrderPrintEntity.getBatchNo());
                     if (stockOrderDetailEntity != null) {
                         stockOrderPrintEntity.setPrice(stockOrderDetailEntity.getPrice());

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

@@ -177,6 +177,20 @@ public class OrderController {
         return ResultVOUtils.success("删除成功");
     }
 
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/inout/order/updateOrder")
+    public BaseResponse updateOrder(@RequestBody OrderEntity orderEntity,
+                                    BindingResult bindingResult) {
+        orderEntity.setUpdateTime(new Date());
+        boolean b = orderService.updateOrder(orderEntity);
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+        return ResultVOUtils.success("更新成功");
+    }
+
+
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/inout/order/updateUnit")
     public BaseResponse updateUnit(@RequestBody @Valid OrderEntity orderEntity,

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

@@ -196,6 +196,10 @@ public class CheckOrderUtils {
                 if (bussinessTypeEntity.isSecCheckSp()) {
                     return ConstantStatus.SORDER_CHECKED;
                 }
+            } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_COPY) {
+                if (bussinessTypeEntity.isSecCheckCopy()) {
+                    return ConstantStatus.SORDER_CHECKED;
+                }
             }
         } else {
             return ConstantStatus.SORDER_DELIVER;

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

@@ -70,4 +70,7 @@ public class BussinessTypeEntity {
     private int orderVisibleType;   //订单详情展示方式：0：根据批次号展示，1:根据条码展示
 
     private boolean supplementAll;
+
+    private boolean checkCopy;
+    private boolean secCheckCopy;
 }

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

@@ -58,4 +58,13 @@ public class ProductInfoEntity {
     private String cplx;
     private String hchzsb;
 
+    private String sfwblztlcp;
+    private String cgzmraqxgxx;
+    private String sfbjwycxsy;
+    private String zdcfsycs;
+    private String sfwwjbz;
+    private String syqsfxyjxmj;
+    private String qtxxdwzlj;
+    private String mjfs;
+
 }

api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java

@@ -55,4 +55,6 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity {
     private String nameCode;
 
     private String deptName;
+    private String billRemark;
+
 }

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

@@ -69,4 +69,6 @@ public class OrderEntity {
 
     private String deptCode;
     private String deptName;
+
+    private String printRemark;
 }

api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java

@@ -46,4 +46,6 @@ public class OrderFilterRequest extends ListPageRequest {
     private Integer entrustId;
     private boolean entrust;
     private String invWarehouseCode;
+
+
 }

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

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

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

@@ -9,6 +9,7 @@ public class UdiTraceResponse {
     private String actDate;
     private String mainAction;
     private String action;
+    private String actionName;
     private String fromCorp;
     private Integer count;
     private String cpmctymc;

api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiContrastService.java

@@ -121,7 +121,6 @@ public class UdiContrastService {
 
 
 
-
     @Resource
     GennerOrderUtils gennerOrderUtils;
     @Resource

api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java

@@ -209,6 +209,9 @@ public class OrderServiceImpl implements OrderService {
     public OrderEntity findById(String orderId) {
         OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
         orderFilterRequest.setId(orderId);
+        if (StrUtil.isEmpty(orderId)) {
+            return null;
+        }
         return orderDao.findOne(orderFilterRequest);
     }
 

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

@@ -610,6 +610,11 @@ public class IoTransInoutService {
                     unCheckFinish(orderEntity, warehouseEntityList);
                     return;
                 }
+            } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_COPY) {
+                if (!bussinessTypeEntity.isCheckCopy()) {
+                    unCheckFinish(orderEntity, warehouseEntityList);
+                    return;
+                }
             }
             genOrderDetail(warehouseEntityList);
 //            checkMutiDi(orderEntity.getId(), bussinessTypeEntity);   //校验一个DI是否绑定多个产品ID
@@ -940,7 +945,16 @@ public class IoTransInoutService {
                 if (bussinessTypeEntity.isSecCheckChange()) {
                     stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);
                 }
+            } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_PEACE_CHANGE) {
+                if (bussinessTypeEntity.isSecCheckBalacne()) {
+                    stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);
+                }
+            } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_COPY) {
+                if (bussinessTypeEntity.isSecCheckCopy()) {
+                    stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);
+                }
             }
+
         } else {
             stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER);
 

api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java

@@ -22,6 +22,7 @@ public class PermissionRuleTreeUtils {
         for (AuthPermissionRule v : authPermissionRuleList) {
             AuthPermissionRuleMergeResponse authPermissionRuleMergeResponse = new AuthPermissionRuleMergeResponse();
             BeanUtils.copyProperties(v, authPermissionRuleMergeResponse);
+            authPermissionRuleMergeResponse.setStatus(Long.valueOf(v.getStatus()));
             if (pid.equals(v.getPid())) {
                 authPermissionRuleMergeResponse.setChildren(merge(authPermissionRuleList, v.getId()));
                 authPermissionRuleMergeResponseList.add(authPermissionRuleMergeResponse);
@@ -33,5 +34,4 @@ public class PermissionRuleTreeUtils {
     }
 
 
-
 }

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

@@ -20,7 +20,8 @@
         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,orderVisibleType,supplementAll
+        localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv,orderVisibleType,supplementAll,
+        checkCopy,secCheckCopy
         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
@@ -138,7 +139,8 @@
         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
-        localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv,orderVisibleType,supplementAll
+        localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv,orderVisibleType,supplementAll,
+        checkCopy,secCheckCopy
         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
@@ -192,7 +194,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,orderVisibleType)
+        ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,outTospms,entrutSpms,defaultInv,orderVisibleType,checkCopy,secCheckCopy)
         values
             (
         #{action},
@@ -236,7 +238,8 @@
         #{outTospms},
         #{entrutSpms},
         #{defaultInv},
-        #{orderVisibleType}
+        #{orderVisibleType},
+        #{checkCopy},#{secCheckCopy}
         )
     </insert>
 
@@ -251,7 +254,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,orderVisibleType)
+        ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,outTospms,entrutSpms,defaultInv,orderVisibleType, checkCopy,secCheckCopy)
         values
             (
         #{index},
@@ -296,7 +299,7 @@
         #{outTospms},
         #{entrutSpms},
         #{defaultInv},
-        #{orderVisibleType}
+        #{orderVisibleType}, #{checkCopy},#{secCheckCopy}
         )
     </insert>
 
@@ -349,6 +352,8 @@
 
             <if test="entrutSpms != null">entrutSpms=#{entrutSpms},</if>
             <if test="orderVisibleType != null">orderVisibleType=#{orderVisibleType},</if>
+            <if test="checkCopy != null">checkCopy=#{checkCopy},</if>
+            <if test="secCheckCopy != null">secCheckCopy=#{secCheckCopy},</if>
 
             thirdSysFk=#{thirdSysFk},
         </trim>

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

@@ -268,48 +268,6 @@
   <![CDATA[   DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S')
         ]]>
     </select>
-    <!--<select id="filterUdi" parameterType="com.glxp.sync.admin.req.ProductInfoFilterRequest"-->
-    <!--resultType="com.glxp.sync.admin.entity.udi.ProductInfoEntity">-->
-    <!--&#45;&#45;         GROUP BY deviceRecordKey-->
-    <!--select p.* from productinfo p INNER JOIN-->
-    <!--(select deviceRecordKey ,max(versionNumber) versionNumber from productinfo-->
-    <!--<where>-->
-
-    <!--<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">-->
-    <!--AND ylqxzcrbarmc= #{ylqxzcrbarmc}-->
-    <!--</if>-->
-
-    <!--<if test="ylqxzcrbarmc == '' and ylqxzcrbarmc == null and cpmctymc != '' and cpmctymc != null">-->
-    <!--AND cpmctymc LIKE concat(#{cpmctymc},'%')-->
-    <!--</if>-->
-
-    <!--<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null and cpmctymc != '' and cpmctymc != null">-->
-    <!--AND cpmctymc LIKE concat('%',#{cpmctymc},'%')-->
-    <!--</if>-->
-    <!--<if test="nameCode != '' and nameCode != null">-->
-    <!--AND nameCode LIKE concat(#{nameCode},'%')-->
-    <!--</if>-->
-    <!--<if test="uuid != '' and uuid != null">-->
-    <!--AND uuid = #{uuid}-->
-    <!--</if>-->
-    <!--<if test="ggxh != '' and ggxh != null">-->
-    <!--AND ggxh LIKE concat('%',#{ggxh},'%')-->
-    <!--</if>-->
-    <!--<if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">-->
-    <!--AND zczbhhzbapzbh LIKE concat('%',#{zczbhhzbapzbh},'%')-->
-    <!--</if>-->
-
-    <!--<if test="deviceRecordKey != '' and deviceRecordKey != null">-->
-    <!--AND deviceRecordKey = #{deviceRecordKey}-->
-    <!--</if>-->
-    <!--<if test="updateTime!=null and updateTime!=''">-->
-    <!--<![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>-->
-    <!--</if>-->
-    <!--</where>-->
-    <!--GROUP BY deviceRecordKey)-->
-    <!--a on p.deviceRecordKey = a.deviceRecordKey and p.versionNumber = a.versionNumber-->
-
-    <!--</select>-->
 
     <select id="syncDlUdi" parameterType="com.glxp.api.admin.req.receipt.ProductInfoFilterRequest"
             resultType="com.glxp.api.admin.entity.basic.ProductInfoEntity">

api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml

@@ -188,15 +188,6 @@
             </if>
             <if test="invWarehouseCode != '' and invWarehouseCode!=null">
                 and invWarehouseCode = #{invWarehouseCode}
-
-                <if test="userId != '' and userId!=null">
-                    and
-                    stock_order.billType in
-                    (select basic_bussiness_type.localAction from inv_bustype_user INNER JOIN basic_bussiness_type on
-                    inv_bustype_user.scAction = basic_bussiness_type.action
-                    WHERE userId =#{userId} and invWarehouseCode =#{invWarehouseCode}
-                    GROUP BY inv_bustype_user.id)
-                </if>
             </if>
             <if test="createUser!=null">
                 and createUser = #{createUser}
@@ -352,17 +343,20 @@
     </select>
 
     <select id="selectSupplementOrderList" resultType="com.glxp.api.admin.entity.business.StockOrderEntity">
-        SELECT billNo,
-               orderIdFk,
-               `status`
-        FROM stock_order
-        WHERE (supplementNo IS NULL OR supplementNo = '')
+        SELECT
+            billNo, orderIdFk, `status`
+        FROM
+            stock_order
+        WHERE
+            ( supplementNo IS NULL OR supplementNo = '' )
           AND billType IN (
-            SELECT localAction
-            FROM basic_bussiness_type
-            WHERE supplementOrderType IS NOT NULL
-               OR supplementOrderType
-            != '')
+            SELECT
+                localAction
+            FROM
+                basic_bussiness_type
+            WHERE
+                supplementOrderType IS NOT NULL
+               OR supplementOrderType != '')
     </select>
 
     <select id="findById" resultType="com.glxp.api.admin.entity.business.StockOrderEntity">
@@ -385,17 +379,17 @@
         select id
         from stock_order
         where billNo in (
-            select erpFk
-            from io_order
-            where erpFk in
-                  (select billNo
-                   from stock_order
-                   where stock_order.billType in (select code from basic_third_sys_bus_api))
-              and exportStatus = 0
-        )
+                select erpFk
+                from io_order
+                where erpFk in
+                      (select billNo
+                       from stock_order
+                       where stock_order.billType in (select code from basic_third_sys_bus_api))
+                  and exportStatus = 0
+                )
     </select>
 
-    <select id="selectIdByOrderIdFk" resultType="java.lang.Integer">
+      <select id="selectIdByOrderIdFk" resultType="java.lang.Integer">
         select id
         from stock_order
         where orderIdFk = #{orderIdFk}
@@ -405,8 +399,7 @@
         select t1.* from stock_order t1 left join io_order t2 on t1.billNo = t2.erpFk
         <where>
             <if test="request.billNo != null and request.billNo != ''">
-                AND (t2.erpFk like concat('%', #{request.billNo}, '%') or t2.thirdBillNo like
-                concat('%',#{request.billNo},'%'))
+                AND (t2.erpFk like concat('%', #{request.billNo}, '%') or t2.thirdBillNo like concat('%',#{request.billNo},'%'))
             </if>
             <if test="request.submitStatus != null">
                 AND t2.exportStatus = #{request.submitStatus}
@@ -436,8 +429,6 @@
         order by t1.billdate desc
     </select>
     <select id="findBillTypeById" resultType="java.lang.String">
-        select billType
-        from stock_order
-        where id = #{id}
+        select billType from stock_order where id = #{id}
     </select>
 </mapper>

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, originFromType,deptCode)
+                             fromSubInvCode, createTime, originFromType,invStorageCode,deptCode,printRemark)
         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}, #{originFromType},#{deptCode})
+                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{originFromType},#{invStorageCode},#{deptCode},#{printRemark})
     </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,originFromType,deptCode)
+                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,originFromType,invStorageCode,deptCode,printRemark)
         values (
         #{id},
         #{action},
@@ -99,7 +99,7 @@
         #{invWarehouseCode},
         #{fromSubInvCode},
         #{createTime},
-        #{originFromType},#{deptCode}
+        #{originFromType},#{invStorageCode},#{deptCode}, #{printRemark}
         )
     </insert>
 
@@ -143,6 +143,7 @@
             <if test="createTime != null and createTime != ''">createTime=#{createTime},</if>
             <if test="originFromType != null and originFromType != ''">originFromType=#{originFromType},</if>
             <if test="deptCode != null and deptCode != ''">deptCode=#{deptCode},</if>
+            <if test="printRemark != null and printRemark != ''">printRemark=#{printRemark},</if>
 
         </trim>
         WHERE id = #{id}
@@ -278,17 +279,8 @@
             </if>
             <if test="invWarehouseCode != '' and invWarehouseCode!=null">
                 and invWarehouseCode =#{invWarehouseCode}
-                <if test="userId != '' and userId!=null">
-                    and
-                    io_order.action in
-                    (select basic_bussiness_type.action from inv_bustype_user INNER JOIN basic_bussiness_type on
-                    inv_bustype_user.scAction = basic_bussiness_type.action
-                    WHERE userId =#{userId} and invWarehouseCode =#{invWarehouseCode}
-                    GROUP BY inv_bustype_user.id)
-                </if>
             </if>
 
-
         </where>
         group by io_order.id
         ORDER BY actDate DESC