root/wms_base
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;
}