Merge branch 'master' of http://121.40.234.130:8899/root/hl_one

# Conflicts:
#	mes/qd/src/views/wms/product_manage/workorder/reportDialog3.vue

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java

@@ -177,6 +177,17 @@ public class SpeFullTask extends AbstractAcsTask {
 //                        pointService.update(new UpdateWrapper<SchBasePoint>()
 //                                .set("vehicle_code",task.getVehicle_code2())
 //                                .eq("point_code",task.getPoint_code3()));
+
+                    }
+                    if (extParam.get("fall_finish") != null){
+                        PdmBiDevice one = deviceService.getOne(new QueryWrapper<PdmBiDevice>().eq("device_code", task.getPoint_code2()));
+                        if (!("fall_finish"+task.getTask_id()).equals(one.getRemark())){
+                            deviceService.update(new UpdateWrapper<PdmBiDevice>()
+                                    .set("material_id", task.getMaterial_id())
+                                    .set("deviceinstor_qty",one.getDeviceinstor_qty().add(task.getMaterial_qty()))
+                                    .set("remark","fall_finish"+task.getTask_id())
+                                    .eq("device_code", task.getPoint_code2()));
+                        }
                     }
                     if (extParam.get("take_finish") != null){
                         log.info("取货完成:{},vechile_code:{}",task.getTask_id(),task.getVehicle_code2());

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/PdmBiDevice.java

@@ -70,7 +70,7 @@ public class PdmBiDevice implements Serializable {
     private String device_code2;
 
     /**
-     * 设备来料仓上限数
+     * 设备上料料斗上限数
      */
     private BigDecimal inupperlimit_qty;
 
@@ -80,7 +80,7 @@ public class PdmBiDevice implements Serializable {
     private BigDecimal inlowerlimit_qty;
 
     /**
-     * 设备产品仓上限数
+     * 设备满料框上限：每筐数量
      */
     private BigDecimal outupperlimit_qty;
 
@@ -95,13 +95,13 @@ public class PdmBiDevice implements Serializable {
     private BigDecimal deviceinitinstor_qty;
 
     /**
-     * 设备实时来料仓数:用于数量校验
+     * 上（倒）料斗实时数:用于数量校验
      */
     private BigDecimal deviceinstor_qty;
     private BigDecimal deviceinstor_weight;
 
     /**
-     * 设备实时产品仓数
+     * 满料框实时数
      */
     private BigDecimal deviceoutstor_qty;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml

@@ -8,6 +8,7 @@
         material.material_name,
         material.material_code,
         material.material_spec,
+        pdm_bi_device.outupperlimit_qty,
         pro.workprocedure_code,
         pro.workprocedure_name,
         user.person_name as current_produce_person_name
@@ -16,6 +17,7 @@
         left join md_me_materialbase material on material.material_id = ShiftOrder.material_id
         left join PDM_BI_WorkProcedure pro on pro.workprocedure_id = ShiftOrder.workprocedure_id
         left join sys_user user on user.user_id = ShiftOrder.current_produce_person_id
+        left join pdm_bi_device on ShiftOrder.device_code = pdm_bi_device.device_code
         WHERE
         ShiftOrder.is_delete = '0'
         <if test="query.workorder_code != null and query.workorder_code != ''">

mes/qd/src/views/wms/product_manage/workorder/reportDialog3.vue

@@ -9,7 +9,7 @@
           <!-- 搜索 -->
           <el-form ref="form" :inline="true" :rules="rules" size="mini" label-width="180px">
             <el-form-item label="工单编码">
-              <el-input v-model="query.workorder_code" style="width: 200px;" clearable/>
+              <el-input v-model="query.workorder_code" style="width: 200px;" clearable />
             </el-form-item>
             <el-form-item label="班次类型" prop="shift_type_scode">
               <el-select
@@ -47,11 +47,11 @@
               />
             </el-form-item>
             <el-dropdown split-button type="primary" class="filter-item" @click="report()">
-              <i class="el-icon-search el-icon--left"/>查询
+              <i class="el-icon-search el-icon--left" />查询
             </el-dropdown>
           </el-form>
         </div>
-        <crudOperation v-show="false" :permission="permission"/>
+        <crudOperation v-show="false" :permission="permission" />
       </div>
       <!--表格渲染-->
 
@@ -63,66 +63,59 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="55"/>
+        <el-table-column type="selection" width="55" />
-        <el-table-column prop="workorder_code" label="工单编号"/>
+        <el-table-column prop="workorder_code" label="工单编号" />
-        <el-table-column prop="seq_number" label="报工顺序号"/>
+        <el-table-column prop="seq_number" label="报工顺序号" />
         <el-table-column prop="shift_type_scode" label="班次类型">
           <template slot-scope="scope">
             {{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
           </template>
         </el-table-column>
-        <el-table-column prop="product_area" label="生产车间"/>
+        <el-table-column prop="product_area" label="生产车间" />
-        <el-table-column prop="device_code" label="设备编码" align="center"/>
+        <el-table-column prop="device_code" label="设备编码" align="center" />
-        <el-table-column prop="needproduct_qty" label="待生产数"/>
+        <el-table-column prop="needproduct_qty" label="待生产数" />
         <el-table-column prop="report_qty" label="报工数量">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.report_qty"/>
+            <el-input v-model="scope.row.report_qty"/></template>
-          </template>
         </el-table-column>
         <el-table-column prop="nok_qty" label="报废数量">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.nok_qty"/>
+            <el-input v-model="scope.row.nok_qty" /></template>
-          </template>
         </el-table-column>
         <el-table-column prop="repare_qty" label="报修数量">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.repare_qty"/>
+            <el-input v-model="scope.row.repare_qty" /></template>
-          </template>
         </el-table-column>
-        <el-table-column prop="person_finish_qty" label="人员期末数量"/>
+        <el-table-column prop="person_finish_qty" label="人员期末数量" />
-        <el-table-column prop="operatetime_start" label="开工时间"/>
+        <el-table-column prop="operatetime_start" label="开工时间" />
-        <el-table-column prop="operatetime_end" label="完工时间"/>
+        <el-table-column prop="operatetime_end" label="完工时间" />
         <el-table-column prop="report_status" label="报工状态">
           <template slot-scope="scope">
-            {{ reportStatus[scope.row.report_status - 1].label }}
+            {{ reportStatus[scope.row.report_status-1].label }}
           </template>
         </el-table-column>
-        <el-table-column prop="produce_person_name" label="操作人" align="center"/>
+        <el-table-column prop="produce_person_name" label="操作人" align="center" />
-        <el-table-column prop="confirm_name" label="审核人" align="center"/>
+        <el-table-column prop="confirm_name" label="审核人" align="center" />
-        <el-table-column prop="confirm_time" label="审核时间" align="center"/>
+        <el-table-column prop="confirm_time" label="审核时间" align="center" />
         <el-table-column label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
-            <el-button :disabled="scope.row.report_status =='3'" size="mini" style="margin-left: -1px;margin-right: 2px"
+            <el-button :disabled="scope.row.report_status =='3'" size="mini" style="margin-left: -1px;margin-right: 2px" type="text" @click="reportApprove(scope.row)">提交审核</el-button>
-                       type="text" @click="reportApprove(scope.row)">提交审核
-            </el-button>
           </template>
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination/>
+      <pagination />
     </el-card>
   </div>
 </template>
 
 <script>
 import crudReport from '@/views/wms/product_manage/workorder/produceshiftorder'
-import CRUD, {presenter, header, form} from '@crud/crud'
+import CRUD, { presenter, header, form } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import rrOperation from '@crud/RR.operation'
-
+const defaultForm = { sale_id: null,
-const defaultForm = {
-  sale_id: null,
   is_report: null,
   workorder_id: null,
   workorder_code: null,
@@ -155,36 +148,29 @@ const defaultForm = {
   material_name: null,
   device_id: null,
   is_canupdate_update: null,
-  material_spec: null
+  material_spec: null }
-}
 
 export default {
   name: 'ReportDialog',
-  components: {crudOperation, pagination, rrOperation},
+  components: { crudOperation, pagination, rrOperation },
   dicts: ['product_area'],
   cruds() {
     return [
-      CRUD({
+      CRUD({ title: '报工审核', url: '/api/produceWorkorder/reportQuery2', query: {}, idField: 'macoperate_id', crudMethod: { ...crudReport }})
-        title: '报工审核',
-        url: '/api/produceWorkorder/reportQuery2',
-        query: {},
-        idField: 'macoperate_id',
-        crudMethod: {...crudReport}
-      })
     ]
   },
   mixins: [presenter(), header(), form(defaultForm)],
   data() {
     return {
-      trueorfalse: [{value: true, label: '是'}, {value: false, label: '否'}],
+      trueorfalse: [{ value: true, label: '是' }, { value: false, label: '否' }],
-      reportStatus: [{value: '1', label: '创建记录'}, {value: '2', label: '报工完成'}, {value: '3', label: '审核完成'}],
+      reportStatus: [{ value: '1', label: '创建记录' }, { value: '2', label: '报工完成' }, { value: '3', label: '审核完成' }],
       queryTypeOptions: [
-        {key: 'name', display_name: '字典名称'},
+        { key: 'name', display_name: '字典名称' },
-        {key: 'description', display_name: '描述'}
+        { key: 'description', display_name: '描述' }
       ],
       rules: {
         material_spec: [
-          {required: true, message: '请输入编码', trigger: 'blur'}
+          { required: true, message: '请输入编码', trigger: 'blur' }
         ]
       },
       permission: {
@@ -196,7 +182,7 @@ export default {
   },
   methods: {
     report() {
-      crudReport.reportQuery({workorder_code: this.form.workorder_code, is_report: this.form.is_report}).then(res => {
+      crudReport.reportQuery({ workorder_code: this.form.workorder_code, is_report: this.form.is_report }).then(res => {
         this.tableData = res.content
       })
     },