rev：修改

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialController.java

@@ -41,6 +41,12 @@ public class BomCallMaterialController {
         return new ResponseEntity<>(TableDataInfo.build(iPdmBomCallMaterialService.queryAll(whereJson, page)), HttpStatus.OK);
     }
 
+    @GetMapping("/queryGroupBom")
+    @Log("退料组盘查询工单分页查询")
+    public ResponseEntity<Object> queryGroupBom(@RequestParam Map whereJson, PageQuery page) {
+        return new ResponseEntity<>(TableDataInfo.build(iPdmBomCallMaterialService.queryGroupBom(whereJson, page)), HttpStatus.OK);
+    }
+
     @PostMapping
     @Log("新增叫料单")
     public ResponseEntity<Object> create(@Validated @RequestBody PdmBomCallMaterial dto) {

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java

@@ -30,6 +30,15 @@ public interface IPdmBomCallMaterialService extends IService<PdmBomCallMaterial>
      */
     IPage<PdmBomCallMaterialDto> queryAll(Map whereJson, PageQuery page);
 
+    /**
+     * 退料组盘查询工单分页查询
+     *
+     * @param whereJson : {查询参数}
+     * @param page      : 分页对象
+     * @return 返回结果
+     */
+    IPage<PdmBomCallMaterialDto> queryGroupBom(Map whereJson, PageQuery page);
+
     /**
      * 新增叫料单
      *

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java

@@ -120,4 +120,9 @@ public class PdmBomCallMaterial implements Serializable {
      */
     private String receive_name;
 
+    /**
+     * 是否二次退料
+     */
+    private String return_two;
+
 }

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.java

@@ -29,6 +29,14 @@ public interface PdmBomCallMaterialMapper extends BaseMapper<PdmBomCallMaterial>
      */
     IPage<PdmBomCallMaterialDto> queryAllByPage(Page<PdmBomCallMaterialDto> page, @Param("param") Map whereJson);
 
+    /**
+     * 退料组盘查询工单分页查询
+     * @param page 分页条件
+     * @param whereJson 查询条件
+     * @return IPage<PdmBomCallMaterialDto>
+     */
+    IPage<PdmBomCallMaterialDto> queryGroupBom(Page<PdmBomCallMaterialDto> page, @Param("param") Map whereJson);
+
     /**
      * 计算总计
      * @param whereJson {}

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.xml

@@ -49,10 +49,38 @@
                 bom.create_time <= #{param.end_time}
             </if>
 
+            <if test="param.return_two != null and param.return_two != '' ">
+                AND
+                bom.return_two = #{param.return_two}
+            </if>
+
         </where>
         ORDER BY bom.create_time Desc
     </select>
 
+    <select id="queryGroupBom" resultType="org.nl.wms.pdm_manage.service.dto.PdmBomCallMaterialDto">
+        SELECT
+            bom.*,
+            mater.material_code,
+            mater.material_name,
+            mater.material_spec
+        FROM
+            pdm_bom_callmaterial bom
+            INNER JOIN md_me_materialbase mater ON mater.material_id = bom.material_id
+        <where>
+            bom.bom_type = '1'
+            AND bom.bom_status = '5'
+            AND bom.start_time = #{param.to_day}
+
+            <if test="param.bom_code != null and param.bom_code != ''">
+                AND
+                bom.bom_code LIKE #{param.bom_code}
+            </if>
+
+        </where>
+        ORDER BY bom.real_weigh_qty Desc
+    </select>
+
     <select id="queryAllSumQty" resultType="org.nl.wms.pdm_manage.service.dto.PdmBomCallMaterialDto">
         SELECT
             SUM(bom.call_qty) AS call_qty,
@@ -99,6 +127,11 @@
                 bom.create_time &lt;= #{param.end_time}
             </if>
 
+            <if test="param.return_two != null and param.return_two != '' ">
+                AND
+                bom.return_two = #{param.return_two}
+            </if>
+
         </where>
         ORDER BY bom.create_time Desc
     </select>

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java

@@ -74,6 +74,13 @@ public class PdmBomCallMaterialServiceImpl extends ServiceImpl<PdmBomCallMateria
         return jsonObjectIPage;
     }
 
+    @Override
+    public IPage<PdmBomCallMaterialDto> queryGroupBom(Map whereJson, PageQuery page) {
+        whereJson.put("to_day", DateUtil.today());
+        return this.baseMapper.queryGroupBom(new Page<>(page.getPage() + 1, page.getSize()),
+                whereJson);
+    }
+
     @Override
     @Transactional
     public void create(PdmBomCallMaterial dto) {

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java

@@ -334,6 +334,7 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl<MdPbGroupplateMapper,
         // 更新主bom
         dao.setReal_weigh_qty(NumberUtil.sub(dao.getReal_weigh_qty(), qty));
         dao.setBom_status(BomEnum.CALL_BOM_STATUS.code("退料中"));
+        dao.setReturn_two(IOSConstant.ONE);
         iPdmBomCallMaterialService.updateById(dao);
     }
 }

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/OutBillServiceImpl.java

@@ -1539,7 +1539,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper, IOStorInv>
             // 如果是领料出库单则更新工单状态以及实际出库重量
             if (ObjectUtil.isNotEmpty(ioStorInvDtl.getSource_bill_code())) {
                 PdmBomCallMaterial callMaterDao = iPdmBomCallMaterialService.findByCode(ioStorInvDtl.getSource_bill_code());
-                callMaterDao.setReal_qty(ioStorInvDtl.getPlan_qty());
+                callMaterDao.setReal_qty(ioStorInvDtl.getAssign_qty());
                 callMaterDao.setBom_status(BomEnum.CALL_BOM_STATUS.code("叫料完成"));
                 iPdmBomCallMaterialService.updateById(callMaterDao);
             }

wms/nladmin-ui/src/views/wms/basedata/group/AddBoms.vue

@@ -0,0 +1,134 @@
+<template>
+  <el-dialog
+    title="工单选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1200px"
+    @close="close"
+    @open="open"
+  >
+    <!-- 搜索 -->
+    <el-form
+      :inline="true"
+      class="demo-form-inline"
+      label-position="right"
+      label-width="80px"
+      label-suffix=":"
+    >
+      <el-form-item label="工单编码">
+        <el-input
+          v-model="query.bom_code"
+          clearable
+          size="mini"
+          placeholder="单据编码"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <rrOperation />
+    </el-form>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column prop="bom_code" label="工单单号" :min-width="flexWidth('bom_code',crud.data,'工单单号')" />
+      <el-table-column prop="bom_status" label="工单状态" :formatter="formattStatus" :min-width="flexWidth('bom_status',crud.data,'工单状态')" />
+      <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+      <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
+      <el-table-column prop="device_code" label="机台编码" :min-width="flexWidth('device_code',crud.data,'机台编码')" />
+      <el-table-column prop="call_qty" label="计划叫料重量" :formatter="crud.formatNum3" :min-width="100" />
+      <el-table-column prop="real_qty" label="实际叫料重量" :formatter="crud.formatNum3" :min-width="100" />
+      <el-table-column prop="real_weigh_qty" label="可退重量" :formatter="crud.formatNum3" :min-width="100" />
+      <el-table-column prop="point_code" label="出库点位" :min-width="flexWidth('point_code',crud.data,'出库点位')" />
+      <el-table-column prop="receive_name" label="领料人" :min-width="flexWidth('receive_name',crud.data,'领料人')" />
+      <el-table-column prop="create_name" label="叫料人" :min-width="flexWidth('create_name',crud.data,'叫料人')" />
+      <el-table-column prop="qty_unit_name" label="单位" :min-width="flexWidth('qty_unit_name',crud.data,'单位')" />
+      <el-table-column prop="create_time" label="叫料时间" :min-width="flexWidth('create_time',crud.data,'叫料时间')" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+
+export default {
+  name: 'AddDtlIos',
+  components: { crudOperation, rrOperation, pagination },
+  cruds() {
+    return CRUD({
+      title: '叫料单据',
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        reset: true,
+        download: false
+      },
+      url: 'api/bomCallMaterial/queryGroupBom',
+      query: {},
+      idField: 'bom_id',
+      sort: 'bom_id,desc'
+    })
+  },
+  mixins: [presenter(), header()],
+  dicts: ['BOM_STATUS', 'BOM_TYPE'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    formattStatus(row) {
+      return this.dict.label.BOM_STATUS[row.bom_status]
+    },
+    formattType(row) {
+      return this.dict.label.BOM_TYPE[row.bom_type]
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    open() {
+      this.crud.toQuery()
+    },
+    submit() {
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选仓位')
+        return
+      }
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged', this.rows)
+    }
+  }
+}
+</script>
+

wms/nladmin-ui/src/views/wms/basedata/group/AddReceiveDtl.vue

@@ -11,13 +11,13 @@
   >
     <el-form ref="form2" :model="formMst" :rules="rules" size="mini" label-width="110px">
       <el-row>
-        <el-col :span="8">
+        <el-col :span="24">
           <el-form-item label="关联工单" prop="bom_list">
             <el-select
               v-model="formMst.bom_list"
               multiple
               size="mini"
-              style="width: 280px;"
+              style="width: 350px;"
               class="filter-item"
               @change="queryBomMater"
             >
@@ -30,9 +30,12 @@
                 <span style="float: right; color: #8492a6; font-size: 13px">{{'可退重量：'+ item.real_weigh_qty }}</span>
               </el-option>
             </el-select>
+            <el-button icon="el-icon-search" size="mini" type="success" @click="addBomsDialog = true">选择工单</el-button>
           </el-form-item>
         </el-col>
+      </el-row>
 
+      <el-row>
         <el-col :span="8">
           <el-form-item label="当前点位" prop="point_code">
             <el-select
@@ -72,6 +75,12 @@
             </el-select>
           </el-form-item>
         </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="烘干次数" prop="bake_num">
+            <el-input-number v-model="formMst.bake_num" :precision="0" :controls="false" :min="0" :max="3" style="width: 220px" />
+          </el-form-item>
+        </el-col>
       </el-row>
 
       <el-row>
@@ -191,12 +200,6 @@
       </el-row>
 
       <el-row>
-        <el-col :span="8">
-          <el-form-item label="烘干次数" prop="bake_num">
-            <el-input-number v-model="formMst.bake_num" :precision="0" :controls="false" :min="0" :max="3" style="width: 220px" />
-          </el-form-item>
-        </el-col>
-
         <el-col :span="8">
           <el-form-item label="品质类型" prop="quality_type">
             <el-select
@@ -266,6 +269,7 @@
         <span />
       </el-col>
     </el-row>
+    <AddBoms :dialog-show.sync="addBomsDialog" @tableChanged="tableChanged" />
   </el-dialog>
 </template>
 
@@ -273,12 +277,14 @@
 
 import CRUD, { crud } from '@crud/crud'
 import crudGroup from '@/views/wms/basedata/group/group'
+import AddBoms from '@/views/wms/basedata/group/AddBoms'
 import crudDeviceinfo from '@/views/wms/basedata/deviceInfo/deviceinfo'
 import crudCallMaterial from '@/views/wms/pdm/callmaterial/callmaterial'
 import crudPoint from '@/views/wms/sch/point/schBasePoint'
 export default {
   name: 'WeighDialog',
   mixins: [crud()],
+  components: { AddBoms },
   dicts: ['storagevehicle_type', 'QUALITY_TYPE'],
   props: {
     dialogShow: {
@@ -322,6 +328,8 @@ export default {
       vehicleList: [],
       current: null,
       dialogVisible: false,
+      addBomsDialog: false,
+      flagnow: false,
       rules: {
         material_code: [
           { required: true, message: '物料不能为空', trigger: 'blur' }
@@ -403,7 +411,7 @@ export default {
         this.bomList = res
       })
       const area_type = 'INOUR01'
-      crudPoint.getPointList({ 'region_code': area_type }).then(res => {
+      crudPoint.getPointList({'region_code': area_type}).then(res => {
         this.pointList = res
       })
     },
@@ -451,7 +459,7 @@ export default {
       })
     },
     queryMater(value) {
-      crudGroup.queryMater({ 'material_code': value }).then(row => {
+      crudGroup.queryMater({'material_code': value}).then(row => {
         this.formMst.material_spec = row.material_spec
         this.formMst.material_name = row.material_name
         this.formMst.material_id = row.material_id
@@ -484,15 +492,36 @@ export default {
       }
     },
     queryVehicle(value) {
-      crudGroup.queryVehicle({ 'point_code': value }).then(res => {
+      crudGroup.queryVehicle({'point_code': value}).then(res => {
         this.vehicleList = res
       })
     },
     queryVehicleType(value) {
-      crudGroup.queryVehicleType({ 'vehicle_code': value }).then(res => {
+      crudGroup.queryVehicleType({'vehicle_code': value}).then(res => {
         this.formMst.box_type = res.storagevehicle_type
       })
+    },
+    tableChanged(rows) {
+      rows.forEach((item) => {
+        if (this.formMst.bom_list.length !== 0) {
+          this.flagnow = false
+
+          for (let j = 0; j < this.formMst.bom_list.length; j++) {
+            const bom_code = this.formMst.bom_list[j]
+            if (bom_code === item.bom_code) {
+              this.flagnow = true
+            }
+          }
+          if (!this.flagnow) {
+            this.formMst.bom_list.push(item.bom_code)
+          }
+        } else {
+          this.formMst.bom_list.push(item.bom_code)
+        }
+      })
+      this.queryBomMater(this.formMst.bom_list)
     }
+
   }
 }
 </script>
@@ -505,5 +534,9 @@ export default {
 .input-with-select  {
   background-color: #fff;
 }
+.select-wrapper {
+  display: flex;
+  align-items: center; /* 垂直居中 */
+}
 
 </style>

wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue

@@ -7,7 +7,7 @@
           :inline="true"
           class="demo-form-inline"
           label-position="right"
-          label-width="80px"
+          label-width="110px"
           label-suffix=":"
         >
           <el-form-item label="单据编码">
@@ -62,6 +62,23 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="是否二次叫料">
+            <el-select
+              v-model="query.return_two"
+              clearable
+              size="mini"
+              placeholder="全部"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.IS_OR_NOT"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="工单类型">
             <el-select
               v-model="query.bom_type"
@@ -339,6 +356,7 @@ const defaultForm = {
   create_name: null,
   create_time: null,
   start_time: null,
+  return_two: null,
   confirm_time: null
 }
 export default {
@@ -346,7 +364,7 @@ export default {
   components: { pagination, crudOperation, rrOperation, udOperation, ViewDialog, ReceivtDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   // 数据字典
-  dicts: ['BOM_STATUS', 'BOM_TYPE'],
+  dicts: ['BOM_STATUS', 'BOM_TYPE', 'IS_OR_NOT'],
   cruds() {
     return CRUD({
       title: '产线叫料',
@@ -403,6 +421,7 @@ export default {
     crudPoint.getPointList({ 'region_code': area_type }).then(res => {
       this.pointList = res
     })
+    this.query.return_two = '0'
     this.initQuery()
   },
   methods: {