代码更新

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java

@@ -75,6 +75,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         if (StrUtil.isNotEmpty(map.get("io_type"))) {
             map.put("io_type", map.get("io_type"));
         }
+        if (StrUtil.isNotEmpty(map.get("is_upload"))) {
+            map.put("is_upload", map.get("is_upload"));
+        }
         if (StrUtil.isNotEmpty(map.get("pcsn"))) {
             map.put("pcsn", "%" + map.get("pcsn") + "%");
         }

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql

@@ -49,6 +49,7 @@
     输入.sap_pcsn                           TYPEAS s_string
     输入.cust_code                           TYPEAS s_string
     输入.package_box_sn                           TYPEAS s_string
+    输入.is_upload                           TYPEAS s_string
     输入.in_stor_id                           TYPEAS f_string
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -108,6 +109,10 @@
                        dis.pcsn like 输入.pcsn
                ENDOPTION
 
+               OPTION 输入.is_upload <> ""
+                       ios.is_upload = 输入.is_upload
+               ENDOPTION
+
                OPTION 输入.io_type <> ""
                       ios.io_type = 输入.io_type
                 ENDOPTION

lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue

@@ -220,18 +220,21 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column type="index" label="序号" width="50" align="center" />
+<!--        <el-table-column type="index" label="序号" width="50" align="center" />-->
-        <el-table-column show-overflow-tooltip prop="is_upload" label="是否回传" :formatter="formatIsUpload" />
+        <el-table-column show-overflow-tooltip prop="is_upload" label="是否回传" :formatter="formatIsUpload" width="80" />
-        <el-table-column show-overflow-tooltip prop="upload_mes" label="回传MES" :formatter="formatUploadMes" />
+        <el-table-column show-overflow-tooltip prop="upload_mes" label="回传MES" :formatter="formatUploadMes" width="80" />
-        <el-table-column show-overflow-tooltip prop="upload_sap" label="回传SAP" :formatter="formatUploadSap" />
+        <el-table-column show-overflow-tooltip prop="upload_sap" label="回传SAP" :formatter="formatUploadSap" width="80" />
         <el-table-column show-overflow-tooltip prop="bill_code" width="130" label="单据号">
           <template slot-scope="scope">
             <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
           </template>
         </el-table-column>
         <el-table-column prop="stor_name" label="仓库" width="100" />
-        <el-table-column min-width="130" show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat"  label="业务类型" />
+        <el-table-column min-width="100" show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat"  label="业务类型" />
-        <el-table-column show-overflow-tooltip width="135" prop="biz_date" label="业务日期" />
+        <el-table-column show-overflow-tooltip width="100" prop="biz_date" label="业务日期" />
+        <el-table-column show-overflow-tooltip width="100" prop="vbeln" label="交货单" />
+        <el-table-column prop="total_qty" label="总重量" width="100" :formatter="crud.formatNum3" />
+        <el-table-column show-overflow-tooltip prop="remark" label="备注" width="100" />
         <el-table-column
           show-overflow-tooltip
           :formatter="create_modeFormat"
@@ -240,8 +243,6 @@
           width="100"
         />
         <el-table-column label="明细数" align="center" prop="detail_count" width="100" />
-        <el-table-column prop="total_qty" label="总重量" width="100" :formatter="crud.formatNum3" />
-        <el-table-column show-overflow-tooltip prop="remark" label="备注" width="100" />
         <el-table-column prop="input_optname" label="制单人" width="100" />
         <el-table-column show-overflow-tooltip prop="input_time" label="制单时间" width="150" />
         <el-table-column prop="update_optname" label="修改人" width="100" />

lms/nladmin-ui/src/views/wms/st/outbill/index.vue

@@ -128,6 +128,23 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="是否回传">
+            <el-select
+              v-model="query.is_upload"
+              clearable
+              size="mini"
+              placeholder="是否回传"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.is_upload"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="创建时间">
             <el-date-picker
               v-model="query.createTime"
@@ -228,16 +245,17 @@
             <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column show-overflow-tooltip :formatter="stateFormat" width="100" prop="bill_status" label="单据状态" />
+        <el-table-column show-overflow-tooltip :formatter="stateFormat" width="80" prop="bill_status" label="单据状态" />
-        <el-table-column prop="stor_name" label="仓库" width="100" />
+        <el-table-column show-overflow-tooltip prop="stor_name" label="仓库" width="80" />
         <el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" label="业务类型" />
-        <el-table-column show-overflow-tooltip width="135" prop="biz_date" label="业务日期" />
+        <el-table-column show-overflow-tooltip width="100" prop="biz_date" label="业务日期" />
-        <el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
+        <el-table-column show-overflow-tooltip label="明细数" align="center" prop="detail_count" width="60" />
-        <el-table-column label="明细数" align="center" prop="detail_count" width="100" />
+        <el-table-column show-overflow-tooltip label="总重量" align="center" prop="total_qty" width="100" />
-        <el-table-column label="总重量" align="center" prop="total_qty" width="100" />
         <el-table-column show-overflow-tooltip label="客户" align="center" prop="cust_simple_name" width="100" />
         <el-table-column show-overflow-tooltip label="客户编码" align="center" prop="cust_code" width="100" />
         <el-table-column show-overflow-tooltip label="交货单号" align="center" prop="vbeln" width="100" />
+        <el-table-column show-overflow-tooltip label="是否回传" align="center" prop="is_upload" width="80" :formatter="formatIsUpload"/>
+        <el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
         <el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" width="100" />
         <el-table-column show-overflow-tooltip label="制单人" align="center" prop="input_optname" />
         <el-table-column show-overflow-tooltip label="制单时间" align="center" prop="input_time" width="140" />
@@ -290,7 +308,7 @@ export default {
   },
   mixins: [presenter(), header(), crud()],
   // 数据字典
-  dicts: ['io_bill_status', 'ST_CREATE_MODE', 'ST_INV_OUT_TYPE'],
+  dicts: ['io_bill_status', 'ST_CREATE_MODE', 'ST_INV_OUT_TYPE', 'is_upload'],
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
@@ -424,6 +442,13 @@ export default {
       this.openParamMoney = row
       this.openMoneyDialog = true
     },
+    formatIsUpload(row) {
+      if (row.is_upload === '0') {
+        return '否'
+      } else if (row.is_upload === '1') {
+        return '是'
+      }
+    },
     printExcel(jo) {
       if (jo.shd_dtl_num === '') {
         return this.crud.notify('客户为空！', CRUD.NOTIFICATION_TYPE.INFO)