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

ruoyi-ui/src/views/wms/docAsn/index.vue

@@ -39,6 +39,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="回传ERP" prop="ediSendFlag">
+        <el-select v-model="queryParams.ediSendFlag" placeholder="请选择单据状态" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.sys_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
 <!--      <el-form-item label="预期到货时间" prop="expectedArriveTime">-->
 <!--        <el-date-picker clearable size="small"-->
 <!--          v-model="queryParams.expectedArriveTime"-->
@@ -116,6 +126,12 @@
       <!--<el-table-column label="客户" align="center" prop="customerId" />-->
 <!--      <el-table-column label="客户单号" align="center" prop="customerNo" />-->
       <el-table-column label="ERP单号" align="center" prop="asnReference1" />
+      <el-table-column label="回传ERP" align="center" prop="ediSendFlag">
+        <template slot-scope="scope">
+          <div v-if="scope.row.ediSendFlag === 'N'">否</div>
+          <div v-if="scope.row.ediSendFlag === 'Y'">是</div>
+        </template>
+      </el-table-column>
       <!--<el-table-column label="asn参考信息" align="center" prop="asnReference2" />-->
 <!--      <el-table-column label="预期到货时间" align="center" prop="expectedArriveTime" width="180">-->
 <!--        <template slot-scope="scope">-->
@@ -180,7 +196,7 @@ import AddOrUpdate from './docAsnHeader-add-or-update'
 
 export default {
   name: "DocAsn",
-  dicts: ['asn_status', 'asn_type'],
+  dicts: ['asn_status', 'asn_type','sys_yes_no'],
   data() {
     return {
       // 遮罩层
@@ -215,6 +231,7 @@ export default {
         asnNo: null,
         asnType: null,
         asnStatus: null,
+        ediSendFlag: null,
         asnReference1: null,
         asnReference2: null,
         releaseStatus: null,

ruoyi-ui/src/views/wms/docOrder/index.vue

@@ -39,6 +39,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="回传ERP" prop="ediSendFlag">
+        <el-select v-model="queryParams.ediSendFlag" placeholder="请选择单据类型" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.sys_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
 <!--      <el-form-item label="发货时间" prop="shipmentTime">-->
 <!--        <el-date-picker clearable size="small"-->
 <!--                        v-model="queryParams.shipmentTime"-->
@@ -127,6 +137,12 @@
         </template>
       </el-table-column>
       <el-table-column label="ERP单号" align="center" prop="soReference1"/>
+      <el-table-column label="回传ERP" align="center" prop="ediSendFlag">
+        <template slot-scope="scope">
+          <div v-if="scope.row.ediSendFlag === 'N'">否</div>
+          <div v-if="scope.row.ediSendFlag === 'Y'">是</div>
+        </template>
+      </el-table-column>
       <el-table-column label="客户单号2" align="center" prop="soReference2"/>
       <el-table-column label="客户单号3" align="center" prop="soReference3"/>
       <el-table-column label="创建时间" align="center" prop="createTime"/>
@@ -207,7 +223,7 @@ import AddOrUpdate from './docOrderHeader-add-or-update'
 
 export default {
   name: "DocOrder",
-  dicts: ['so_status', 'so_type'],
+  dicts: ['so_status', 'so_type','sys_yes_no'],
   data() {
     return {
       addOrUpdateVisible: false,
@@ -237,6 +253,7 @@ export default {
         customerId: null,
         orderStatus: null,
         orderType: null,
+        ediSendFlag: null,
         soReference1: null,
         soReference2: null,
         soReference3: null,

warewms-ams/src/main/resources/mapper/docOrder/WmsDocOrderHeaderMapper.xml

@@ -155,6 +155,7 @@
         <where>
             <if test="orderNo != null  and orderNo != ''"> and order_no like concat('%', #{orderNo}, '%')</if>
             <if test="consigneeName != null  and consigneeName != ''"> and consignee_name like concat('%', #{consigneeName}, '%')</if>
+            <if test="ediSendFlag != null  and ediSendFlag != ''"> and edi_send_flag like concat('%', #{ediSendFlag}, '%')</if>
             <if test="carrierName != null  and carrierName != ''"> and carrier_name like concat('%', #{carrierName}, '%')</if>
             <if test="soReference1 != null  and soReference1 != ''"> and so_reference1 like concat('%', #{soReference1}, '%')</if>
         </where>