root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：三线半成品

Browse Source
This commit is contained in:
liuxy
2023-09-13 13:23:20 +08:00
parent 9ec53a5ba0
commit 5d73e0720e
14 changed files with 52 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStHrBcpInServiceImpl.java
View File

@@ -136,7 +136,7 @@ public class PdaStHrBcpInServiceImpl implements PdaStHrBcpInService {
double weight = NumberUtil.div(NumberUtil.mul(materDao.getNet_weight().doubleValue(), whereJson.getDoubleValue("qty")), 1000);
dao.setWeight(BigDecimal.valueOf(weight));
dao.setQty(whereJson.getBigDecimal("qty"));
dao.setType(IOSEnum.IO_TYPE.check("入库"));
dao.setType(IOSEnum.IO_TYPE.code("入库"));
dao.setIs_delete(false);
dao.setCreate_time(DateUtil.now());
dao.setBiz_date(DateUtil.today());

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/dao/mapper/xml/StIvtIostorinvHrBcpMapper.xml
View File

@@ -9,7 +9,7 @@
mater.material_spec,
task.task_code,
task.task_status,
ROUND(dtl.plan_qty / dtl.unit_weight,3 ) AS qty
ROUND((dtl.plan_qty * dtl.unit_weight) / 1000,3 ) AS qty
FROM
st_ivt_iostorinv_hr_bcp dtl
LEFT JOIN md_me_materialbase mater ON mater.material_id = dtl.material_id

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpInServiceImpl.java
View File

@@ -473,7 +473,7 @@ public class StIvtIostorinvHrBcpInServiceImpl extends ServiceImpl<StIvtIostorinv
JSONObject jsonDtl = new JSONObject();
jsonDtl.put("material_id", orderDao.getMaterial_id());
jsonDtl.put("pcsn", "");
jsonDtl.put("plan_qty", orderDao.getWeight());
jsonDtl.put("plan_qty", orderDao.getQty());
jsonDtl.put("quality_scode", IVTEnum.QUALITY_SCODE.code("合格品"));
物料信息:

25
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpOutServiceImpl.java
View File

@@ -2,6 +2,7 @@ package org.nl.wms.storage_manage.semimanagehr.service.iostorInv.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
@@ -43,13 +44,16 @@ import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;
import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
import org.nl.wms.storage_manage.IOSEnum;
import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivtflowService;
import org.nl.wms.storage_manage.pda.PDAEnum;
import org.nl.wms.storage_manage.productmanage.util.ChangeIvtUtil;
import org.nl.wms.storage_manage.productmanage.util.DivRuleCpService;
import org.nl.wms.storage_manage.productmanage.util.RuleUtil;
import org.nl.wms.storage_manage.semimanage.service.structIvt.IStIvtStructivtBcpService;
import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp;
import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.IStIvtIostorinvHrBcpOutService;
import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.IStIvtIostorinvOrderService;
import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.dao.StIvtIostorinvHrBcp;
import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.dao.StIvtIostorinvOrder;
import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.dao.mapper.StIvtIostorinvHrBcpMapper;
import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.dto.HrBcpIostorInvQuery;
import org.nl.wms.storage_manage.semimanagehr.service.structIvt.IStIvtStructivtHrBcpService;
@@ -94,6 +98,8 @@ public class StIvtIostorinvHrBcpOutServiceImpl extends ServiceImpl<StIvtIostorin
private IStIvtStructivtflowHrService iStIvtStructivtflowService; // 海柔库存变动服务
@Autowired
protected IMdPbStoragevehicleextService iMdPbStoragevehicleextService; // 载具扩展属性信息表服务
@Autowired
private IStIvtIostorinvOrderService iStIvtIostorinvOrderService; // 出入库顺序服务
@Override
public Object queryDtl(HrBcpIostorInvQuery query, PageQuery pageQuery) {
@@ -234,6 +240,25 @@ public class StIvtIostorinvHrBcpOutServiceImpl extends ServiceImpl<StIvtIostorin
.eq(MdPbStoragevehicleext::getStoragevehicle_code,mst.getStoragevehicle_code())
);
// 插入出入库顺序表
StIvtIostorinvOrder dao = new StIvtIostorinvOrder();
dao.setOrder_id(IdUtil.getStringId());
dao.setWorkshop_id(PDAEnum.WORKSHOP_ID.code("智能三线车间"));
dao.setStor_id(PDAEnum.STOR_ID.code("紫铜三线半成品仓库"));
dao.setOut_device(mst.getPoint_code());
dao.setBar_code(mst.getStoragevehicle_code());
dao.setMaterial_id(mst.getMaterial_id());
dao.setSale_id("");
// 重量 : kg
dao.setWeight(mst.getPlan_qty());
dao.setQty(mst.getPlan_qty());
dao.setType(IOSEnum.IO_TYPE.code("出库"));
dao.setIs_delete(false);
dao.setCreate_time(DateUtil.now());
dao.setBiz_date(DateUtil.today());
dao.setWorkprocedure_id("");
iStIvtIostorinvOrderService.save(dao);
return null;
}

4
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproductHrCheck/AddDialog.vue
View File

@@ -158,8 +158,8 @@
<el-table-column prop="struct_name" label="盘点货位" align="center" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="120" align="center" />
<el-table-column prop="material_name" label="物料名称" align="center" min-width="120" show-overflow-tooltip />
<el-table-column prop="base_qty" label="重量/数量" align="center" :formatter="crud.formatNum0" />
<el-table-column prop="unit_weight" label="单重" align="center" />
<el-table-column prop="base_qty" label="数量(个)" align="center" :formatter="crud.formatNum0" />
<el-table-column prop="unit_weight" label="单重(g)" align="center" />
<el-table-column prop="storagevehicle_code" label="载具号" align="center" />
<el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="160" fixed="right">
<template scope="scope">

2
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproductHrCheck/CheckDialog.vue
View File

@@ -132,7 +132,7 @@
</template>
</el-table-column>
<el-table-column prop="material_name" label="物料名称" align="center" width="120" show-overflow-tooltip />
<el-table-column prop="base_qty" label="重量/数量" :formatter="crud.formatNum0" align="center" />
<el-table-column prop="base_qty" label="数量(个)" :formatter="crud.formatNum0" align="center" />
<el-table-column prop="qty_unit_name" label="计量单位" align="center" />
<el-table-column prop="check_result" label="是否异常" align="center" :formatter="check_resultFormat" />
<el-table-column prop="status" label="单据状态" align="center" :formatter="bill_statusFormat" />

4
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproductIvthrFlow/index.vue
View File

@@ -133,8 +133,8 @@
<el-table-column show-overflow-tooltip min-width="120" prop="bill_code" label="单据号" />
<el-table-column show-overflow-tooltip min-width="120" prop="change_person_name" label="变动人" />
<el-table-column show-overflow-tooltip min-width="150" prop="change_time" label="变动时间" />
<el-table-column show-overflow-tooltip prop="change_qty" label="变动数(g)" :formatter="crud.formatNum3" />
<el-table-column show-overflow-tooltip prop="result_qty" label="结存数(g)" :formatter="crud.formatNum3" />
<el-table-column show-overflow-tooltip prop="change_qty" label="变动数(个)" :formatter="crud.formatNum3" />
<el-table-column show-overflow-tooltip prop="result_qty" label="结存数(个)" :formatter="crud.formatNum3" />
<!-- <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />-->
</el-table>
<!--分页组件-->

6
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrIn/AddDialog.vue
View File

@@ -100,7 +100,7 @@
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px"/>
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<el-form-item label="总数量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;数&nbsp;量:</label>
<el-input-number
v-model="form.total_qty"
@@ -152,7 +152,7 @@
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码"/>
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称"/>
<el-table-column show-overflow-tooltip prop="material_spec" label="物料规格"/>
<el-table-column show-overflow-tooltip prop="plan_qty" label="重量">
<el-table-column show-overflow-tooltip prop="plan_qty" label="数量(个)">
<template slot-scope="scope">
<el-input-number
v-model="form.tableData[scope.$index].plan_qty"
@@ -165,7 +165,7 @@
/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="unit_weight" label="单重">
<el-table-column show-overflow-tooltip prop="unit_weight" label="单重(g)">
<template slot-scope="scope">
<el-input-number
v-model="form.tableData[scope.$index].unit_weight"

15
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrIn/ViewDialog.vue
View File

@@ -79,17 +79,6 @@
<label slot="label">总&nbsp;&nbsp;数&nbsp;量:</label>
<el-input v-model="form.plan_qty" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
<el-input-number
v-model="form.total_qty"
:controls="false"
:precision="3"
:min="0"
disabled
style="width: 210px"
/>
</el-form-item>
<el-form-item label="业务日期" prop="biz_date">
<el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="true" />
</el-form-item>
@@ -117,9 +106,9 @@
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
<el-table-column prop="pcsn" label="批次" width="150" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量(个)" align="center" />
<el-table-column prop="qty_unit_name" label="单位" align="center" />
<el-table-column prop="unit_weight" label="单重" align="center" />
<el-table-column prop="unit_weight" label="单重(g)" align="center" />
<el-table-column prop="storagevehicle_code" label="载具号" align="center" />
<el-table-column prop="point_code" label="起始位置" align="center" />
<el-table-column prop="struct_code" label="目的位置" align="center" />

6
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrIn/index.vue
View File

@@ -161,9 +161,9 @@
<!-- <el-table-column show-overflow-tooltip prop="base_bill_code" min-width="120" label="关联单据号" />-->
<el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
<el-table-column show-overflow-tooltip min-width="120" prop="plan_qty" label="总重量(g)" />
<el-table-column show-overflow-tooltip min-width="120" prop="qty" label="总数量(个)" />
<el-table-column show-overflow-tooltip min-width="120" prop="unit_weight" label="单重" />
<el-table-column show-overflow-tooltip min-width="120" prop="plan_qty" label="总数量(个)" />
<el-table-column show-overflow-tooltip min-width="120" prop="qty" label="总重量(KG)" />
<el-table-column show-overflow-tooltip min-width="120" prop="unit_weight" label="单重(g)" />
<el-table-column show-overflow-tooltip min-width="120" prop="storagevehicle_code" label="载具号" />
<el-table-column show-overflow-tooltip min-width="120" prop="point_code" label="入库点" />
<el-table-column show-overflow-tooltip min-width="120" prop="struct_code" label="分配货位" />

2
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrIvt/index.vue
View File

@@ -92,7 +92,7 @@
<el-table-column show-overflow-tooltip min-width="120" prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
<el-table-column show-overflow-tooltip prop="canuse_qty" label="可用重量(g)" :formatter="crud.formatNum3" />
<el-table-column show-overflow-tooltip prop="canuse_qty" label="可用数量(个)" :formatter="crud.formatNum3" />
<!-- <el-table-column show-overflow-tooltip prop="unit_name" label="单位" />-->
<el-table-column show-overflow-tooltip prop="instorage_time" label="入库时间" min-width="150" />
</el-table>

6
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrout/AddDialog.vue
View File

@@ -123,7 +123,7 @@
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<el-form-item label="总数量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;数&nbsp;量:</label>
<el-input-number
v-model="form.total_qty"
@@ -176,8 +176,8 @@
<el-table-column show-overflow-tooltip prop="struct_code" label="仓位" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip prop="plan_qty" label="重量(g)" />
<el-table-column show-overflow-tooltip prop="unit_weight" label="单重" />
<el-table-column show-overflow-tooltip prop="plan_qty" label="数量(个)" />
<el-table-column show-overflow-tooltip prop="unit_weight" label="单重(g)" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
<el-table-column v-if="crud.status.add === 1" align="center" label="操作" width="170" fixed="right">
<template scope="scope">

10
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrout/ViewDialog.vue
View File

@@ -75,12 +75,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="总数量" prop="detail_count">
<el-form-item label="总数量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;数&nbsp;量:</label>
<el-input v-model="form.qty" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
<el-input-number
v-model="form.plan_qty"
:controls="false"
@@ -117,9 +113,9 @@
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
<el-table-column prop="pcsn" label="批次" width="150" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量(个)" align="center" />
<!-- <el-table-column prop="qty_unit_name" label="单位" align="center" />-->
<el-table-column prop="unit_weight" label="单重" align="center" />
<el-table-column prop="unit_weight" label="单重(g)" align="center" />
<el-table-column prop="storagevehicle_code" label="载具号" align="center" />
<el-table-column prop="struct_code" label="起始位置" align="center" />
<el-table-column prop="point_code" label="目的位置" align="center" />

7
mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrout/index.vue
View File

@@ -160,9 +160,10 @@
<el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="业务类型" :formatter="bill_typeFormat" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
<el-table-column show-overflow-tooltip min-width="120" prop="plan_qty" label="总重量(g)" />
<el-table-column show-overflow-tooltip min-width="120" prop="qty" label="总数量(个)" />
<!-- <el-table-column show-overflow-tooltip min-width="120" prop="qty_unit_name" label="单位" />-->
<el-table-column show-overflow-tooltip min-width="120" prop="plan_qty" label="总数量(个)" />
<el-table-column show-overflow-tooltip min-width="120" prop="qty" label="总重量(KG)" />
<el-table-column show-overflow-tooltip min-width="120" prop="unit_weight" label="单重(g)" />
<!-- <el-table-column show-overflow-tooltip min-width="120" prop="qty_unit_name" label="单位" />-->
<el-table-column show-overflow-tooltip min-width="120" prop="point_code" label="出库点" />
<el-table-column show-overflow-tooltip min-width="120" prop="struct_code" label="分配货位" />
<el-table-column label="备注" align="center" prop="remark" />