diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
index 596078a..a92d5bd 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java
@@ -34,6 +34,7 @@ import com.glxp.sale.admin.service.inout.*;
 import com.glxp.sale.admin.service.inventory.InvWarehouseService;
 import com.glxp.sale.admin.service.param.SystemParamConfigService;
 import com.glxp.sale.admin.thread.InvProductsTrService;
+import com.glxp.sale.admin.thread.IoTransInoutService;
 import com.glxp.sale.admin.util.*;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
@@ -92,6 +93,8 @@ public class OrderController {
     CodesTempDao codesTempDao;
     @Resource
     private AuthAdminService authAdminService;
+    @Resource
+    IoTransInoutService ioTransInoutService;
 
     @AuthRuleAnnotation("")
     @GetMapping("udiwms/inout/order/getUdi")
@@ -634,6 +637,9 @@ public class OrderController {
             mainOrderEntity.setErpFk(docidStr);
             mainOrderEntity.setUpdateTime(new Date());
             orderService.updateOrder(mainOrderEntity);
+            if (orderMergeRequest.getType() == 1) {
+                ioTransInoutService.transStatus(mainOrderEntity.getId());
+            }
 //            ioTransInoutService.transStatus(mainOrderEntity.getId());
         } else {
             return ResultVOUtils.error(ResultEnum.DATA_ERROR);
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
index 971298d..420be0f 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
@@ -96,7 +96,6 @@ public class WareHouseController {
     CompanyProductRelevanceService companyProductRelevanceService;
     @Resource
     SystemParamConfigService systemParamConfigService;
-    Logger logger = LoggerFactory.getLogger(StockOrderController.class);
     @Resource
     StockOrderService stockOrderService;
     @Resource
@@ -279,11 +278,6 @@ public class WareHouseController {
     @AuthRuleAnnotation("")
     @GetMapping("warehouse/inout/submitOrderWeb")
     public BaseResponse submitOrderWeb(AddOrderRequest orderEntity) {
-//        if (null != orderEntity) {
-//            if (StrUtil.isBlank(orderEntity.getInvWarehouseCode())) {
-//                return ResultVOUtils.error(500, "分仓未选择");
-//            }
-//        }
         orderService.updateOrderStatus(orderEntity.getOrderId(), ConstantStatus.ORDER_STATUS_PROCESS);
         return saveOrderWeb(orderEntity);
     }
@@ -318,6 +312,30 @@ public class WareHouseController {
     @AuthRuleAnnotation("")
     @PostMapping("warehouse/inout/saveTempCode")
     public BaseResponse saveCode(@RequestBody WarehouseEntity warehouseEntity) {
+
+        if (StrUtil.isNotEmpty(warehouseEntity.getSerialNo()) && warehouseEntity.getSerialNo().length() > 20) {
+            return ResultVOUtils.error(500, "无效条码！序列号超出最大范围");
+        }
+
+        if (StrUtil.isNotEmpty(warehouseEntity.getBatchNo()) && warehouseEntity.getBatchNo().length() > 20) {
+            return ResultVOUtils.error(500, "无效条码！批次号超出最大范围");
+        }
+
+        if (StrUtil.isEmpty(warehouseEntity.getSerialNo()) && StrUtil.isEmpty(warehouseEntity.getBatchNo())) {
+            return ResultVOUtils.error(500, "批次号不能为空！");
+        }
+
+
+        if (StrUtil.isNotEmpty(warehouseEntity.getSerialNo())) {
+            List<WarehouseEntity> warehouseEntityList = codesTempService.findByOrderId(warehouseEntity.getOrderId());
+            for (WarehouseEntity object : warehouseEntityList) {
+                if (object.getId() != warehouseEntity.getId() && object.getCode().equals(warehouseEntity.getCode()) && StrUtil.nullToEmpty(object.getCode()).equals(warehouseEntity.getSerialNo())) {
+                    return ResultVOUtils.error(500, "条码重复！");
+                }
+            }
+        }
+
+
         boolean b = codesTempService.update(warehouseEntity);
         if (b)
             return ResultVOUtils.success("修改成功");
@@ -370,11 +388,7 @@ public class WareHouseController {
                 }
             }
         }
-
         return ResultVOUtils.success();
-
-//
-
     }
 
     @Resource
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
index adde15f..16b9dbd 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
@@ -284,8 +284,6 @@ public class OrderServiceImpl implements OrderService {
         supplementOrder.setMainAction(supplementType.getMainAction());
         supplementOrder.setAction(supplementType.getAction());
         supplementOrder.setErpFk(null);
-//        String time = DateUtil.getBeforeMinute(supplementOrder.getActDate(), 5);
-//        supplementOrder.setActDate(time);
 
         //复制码表
         List<WarehouseEntity> codes = codesDao.findByReceiptId(order.getId());
@@ -330,7 +328,8 @@ public class OrderServiceImpl implements OrderService {
         stockOrderEntityList.forEach(stockOrderEntity -> {
             StockOrderResponse response = new StockOrderResponse();
             BeanUtil.copyProperties(stockOrderEntity, response);
-            if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_DELIVER) && checkBusTypeSupplementOrder(stockOrderEntity.getBillNo())) {
+            if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_DELIVER) && checkBusTypeSupplementOrder(stockOrderEntity.getBillNo())
+                    && StrUtil.isEmpty(stockOrderEntity.getSupplementNo())) {
                 response.setEnableSupplementOrder(true);
             }
             result.add(response);