Merge remote-tracking branch 'origin/xuankuang' into xuankuang

ruoyi-ui/src/views/ams/task/index.vue

@@ -203,7 +203,7 @@
       <el-table-column label="终点点位" align="center" prop="locationTo" />
       <el-table-column label="终点区域" align="center" prop="areaTo" />
       <!--      <el-table-column label="优先级" align="center" prop="priority" />-->
-      <el-table-column label="入库单号" align="center" prop="ext1" />
+      <el-table-column label="wms单号" align="center" prop="ext1" />
       <el-table-column label="托盘号" align="center" prop="ext2" />
       <el-table-column label="wcs任务号" align="center" prop="ext3" />
 <!--      <el-table-column label="AGV站点" align="center" prop="agvStation" />-->

ruoyi-ui/src/views/wms/docOrder/docOrderDetails-add-or-update.vue

@@ -13,7 +13,7 @@
             <el-input v-model="dataForm.orderNo" :disabled="true" placeholder=""></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="8" v-if="false">
           <el-form-item label="客户" prop="customerId">
             <el-select v-model="dataForm.customerId" placeholder="请选择" style="width: 100%" clearable>
               <el-option
@@ -46,7 +46,7 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="8" v-if="false">
           <el-form-item label="指定库区" prop="pickZone">
             <el-select v-model="dataForm.pickZone" @change="locationZoneChange" placeholder="请选择库区" clearable
                        size="small" style="width: 100%">
@@ -59,7 +59,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="8" v-if="false">
           <el-form-item label="指定库位" prop="location">
             <el-select v-model="dataForm.location" placeholder="请选择库位" clearable size="small" style="width: 100%">
               <el-option
@@ -142,7 +142,7 @@
         dataForm: {
           orderNo: '',
           orderLineNo: '',
-          customerId: '',
+          // customerId: '',
           lineStatus: '00',
           sku: '',
           pickZone: '',

warewms-base/src/main/java/com/ruoyi/base/constant/Constant.java

@@ -25,9 +25,9 @@ public class Constant {
     public static final Long LOC_MIDDLE_CACHE = 99999l;
 
     //region WCS智库 工单下发
-    public static final String WCS_TASK_URL = "http://localhost:8008/test/wcs/test1";
+    public static final String WCS_TASK_URL = "http://192.168.100.10:8082/gsjc/wms/bill";
     //出库任务下发
-    public static final String WCS_TASK_URL1 = "http://localhost:8008/test/wcs/test2";
+    public static final String WCS_TASK_URL1 = "http://192.168.100.10:8082/gsjc/wms/out/task";
 
     /**
      * 产线编号