fix 与mes对接

lms/nladmin-ui/src/api/feedbackRecord.js

@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/feedbackRecord',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/feedbackRecord/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/feedbackRecord',
+    method: 'put',
+    data
+  })
+}
+
+export function retransmission(data) {
+  return request({
+    url: 'api/feedbackRecord/retransmission',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, retransmission }

lms/nladmin-ui/src/views/system/record/index.vue

@@ -0,0 +1,178 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix=":"
+        >
+          <el-form-item label="任务编码">
+            <el-input
+              v-model="query.feedback_code"
+              clearable
+              size="mini"
+              placeholder="任务编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="是否成功">
+            <el-switch
+              v-model="query.is_success"
+              active-value="0"
+              inactive-value="1"
+              active-color="#C0CCDA"
+              inactive-color="#409EFF"
+            />
+          </el-form-item>
+          <rrOperation/>
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission"/>
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
+                 :title="crud.status.title" width="500px"
+      >
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+          <el-form-item label="反馈编码">
+            <el-input v-model="form.feedback_code" style="width: 370px;" disabled/>
+          </el-form-item>
+          <el-form-item label="相应编码">
+            <el-input v-model="form.code" style="width: 370px;" disabled/>
+          </el-form-item>
+          <el-form-item label="响应信息">
+            <el-input v-model="form.message" style="width: 370px;" disabled/>
+          </el-form-item>
+          <el-form-item label="请求报文">
+            <el-input v-model="form.request_param" :rows="8" type="textarea" style="width: 370px;"/>
+          </el-form-item>
+          <el-form-item label="响应结果">
+            <el-input v-model="form.response_param" :rows="3" type="textarea" style="width: 370px;" disabled/>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;"
+                @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column type="selection" width="55"/>
+        <el-table-column prop="feedback_code" label="反馈编码"
+                         :min-width="flexWidth('feedback_code',crud.data,'反馈编码')"
+        />
+        <el-table-column prop="code" label="响应编码" :min-width="flexWidth('code',crud.data,'相应编码')"/>
+        <el-table-column prop="message" label="响应信息" :min-width="flexWidth('message',crud.data,'响应信息')"/>
+        <el-table-column prop="request_param" label="请求报文" width="250" show-overflow-tooltip/>
+        <el-table-column prop="response_param" label="响应结果" width="250" show-overflow-tooltip/>
+        <el-table-column prop="is_success" label="是否成功" :min-width="flexWidth('is_success',crud.data,'是否成功')">
+          <template slot-scope="scope">
+            {{ scope.row.is_success == '1' ? '是' : '否' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="record_time" label="记录时间"
+                         :min-width="flexWidth('record_time',crud.data,'记录时间')"
+        />
+        <el-table-column v-permission="[]" label="操作" width="200" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              style="display:inline;"
+              :data="scope.row"
+              :permission="permission"
+            />
+            <el-button
+              type="text"
+              slot="left"
+              icon="el-icon-refresh-left"
+              @click="retransmission(scope.row)"
+            >
+              重发
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination/>
+    </div>
+  </div>
+</template>
+
+<script>
+import crudFeedbackRecord from '@/api/feedbackRecord'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+
+const defaultForm = {
+  feedback_id: null,
+  feedback_code: null,
+  code: null,
+  message: null,
+  request_param: null,
+  response_param: null,
+  is_success: null,
+  record_time: null
+}
+export default {
+  name: 'FeedbackRecord',
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: 'mes对接信息记录',
+      url: 'api/feedbackRecord',
+      idField: 'feedback_id',
+      sort: 'feedback_id,desc',
+      crudMethod: { ...crudFeedbackRecord },
+      optShow: {
+        add: false,
+        edit: true,
+        del: true
+      }
+    })
+  },
+  data() {
+    return {
+      permission: {},
+      rules: {}
+    }
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    retransmission(row) {
+      this.$confirm('重发此请求报文, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        crudFeedbackRecord.retransmission(row).then(res => {
+          this.$message({
+            type: 'success',
+            message: '重发成功!'
+          })
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消重发'
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue

@@ -232,6 +232,9 @@
               style="width: 200px;"
             />
           </el-form-item>
+          <el-form-item label="货柜ID" prop="container_id">
+            <el-input v-model="form.container_id" style="width: 200px;"/>
+          </el-form-item>
           <el-form-item label="是否搬运" prop="is_needmove">
             <el-radio
               v-for="item in dict.is_or_not"
@@ -279,6 +282,7 @@
         <el-table-column prop="real_qty" label="实际数量" />
         <el-table-column v-if="false" prop="material_id" label="物料标识" />
         <el-table-column prop="device_name" label="设备" width="100" show-overflow-tooltip />
+        <el-table-column prop="container_id" label="柜号ID" width="100" show-overflow-tooltip />
         <el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
         <el-table-column prop="material_name" label="物料名称" width="100" show-overflow-tooltip />
         <el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip />
@@ -335,6 +339,7 @@ const defaultForm = {
   producedeviceorder_code: null,
   shift_type_scode: '01',
   workprocedure_id: null,
+  container_id: null,
   produce_date: null,
   plan_qty: null,
   real_qty: null,
@@ -364,7 +369,7 @@ const defaultForm = {
   is_canupdate_update: '1',
   material_spec: null,
   sale_id: null,
-  workorder_type: '1'
+  workorder_type: '2'
 }
 export default {
   name: 'Produceshiftorder',
@@ -412,11 +417,8 @@ export default {
         material_code: [
           { required: true, message: '物料编码不能为空', trigger: 'change' }
         ],
-        planproducestart_date: [
-          { required: true, message: '计划生产开始时间不能为空', trigger: 'blur' }
-        ],
-        planproduceend_date: [
-          { required: true, message: '计划生产结束时间不能为空', trigger: 'blur' }
+        container_id: [
+          { required: true, message: '货柜ID不能为空', trigger: 'blur' }
         ],
         order_status: [
           { required: true, message: '工单状态不能为空', trigger: 'blur' }

lms/nladmin-ui/src/views/wms/sch/point/index.vue

@@ -285,9 +285,12 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
+          <el-form-item label="载具编码" prop="vehicle_code">
             <el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
           </el-form-item>
+          <el-form-item label="货柜ID" prop="container_id">
+            <el-input v-model="form.container_id" clearable style="width: 370px;" />
+          </el-form-item>
           <el-form-item label="已放载具类型" prop="vehicle_type">
 <!--            <el-input v-model="" clearable style="width: 370px;" />-->
             <el-select v-model="form.vehicle_type" placeholder="请选择">
@@ -354,6 +357,7 @@
         </el-table-column>
         <el-table-column prop="point_name" label="点位名称" width="150" sortable show-overflow-tooltip />
         <el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="container_id" label="货柜ID" min-width="120" show-overflow-tooltip />
         <el-table-column prop="material_name" label="物料名称" min-width="120" show-overflow-tooltip />
         <el-table-column prop="point_type_name" label="点位类型" min-width="120" show-overflow-tooltip/>
         <el-table-column prop="point_status_name" label="点位状态" />
@@ -422,6 +426,7 @@ const defaultForm = {
   can_vehicle_types: null,
   vehicle_qty: null,
   source_id: null,
+  container_id: null,
   remark: null,
   is_used: null,
   is_delete: null,