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

rev：半成品出库、半成品入库、半成品盘点、半成品拼盘、成品入库一体机

Browse Source
This commit is contained in:
liuxy
2023-06-30 15:37:00 +08:00
parent f37b0afe88
commit 6bf6e23d0b
48 changed files with 1383 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java
View File

@@ -38,6 +38,7 @@ public enum AcsTaskEnum {
TASK_STRUCT_CHECK("14","半成品-盘点"),
TASK_STRUCT_SHUT("15","半成品-拼盘任务出"),
TASK_STRUCT_SHUT_IN("16","半成品-拼盘任务入"),
TASK_STRUCT_BCP_EMPOUT("17","半成品-空托盘出库"),
TASK_STRUCT_CP_IN("11","入库-成品-生产入库"),
TASK_STRUCT_CP_OUT("12","出库-成品-生产出库"),
TASK_STRUCT_CP_CHECK("13","成品-盘点"),

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/IMdMeMaterialbaseService.java
View File

@@ -1,8 +1,11 @@
package org.nl.wms.masterdata_manage.service.material;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 物料基本信息表 服务类
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IMdMeMaterialbaseService extends IService<MdMeMaterialbase> {
List getPdaBcpGetMaterial(JSONObject whereJson);
}

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/mapper/MdMeMaterialbaseMapper.java
View File

@@ -1,8 +1,12 @@
package org.nl.wms.masterdata_manage.service.material.dao.mapper;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
import java.util.List;
import java.util.Map;
/**
* <p>
* 物料基本信息表 Mapper 接口
@@ -13,4 +17,5 @@ import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
*/
public interface MdMeMaterialbaseMapper extends BaseMapper<MdMeMaterialbase> {
List<Map> getPdaBcpGetMaterial(JSONObject map);
}

14
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/mapper/MdMeMaterialbaseMapper.xml
View File

@@ -2,4 +2,18 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.masterdata_manage.service.material.dao.mapper.MdMeMaterialbaseMapper">
<select id="getPdaBcpGetMaterial" resultType="java.util.Map">
SELECT
*
FROM
md_me_materialbase
WHERE
1 = 1
<if test="material_code != null and material_code != ''">
AND (material_code LIKE '%${material_code}%' or
material_name LIKE '%${material_code}%')
</if>
order by material_code ASC
</select>
</mapper>

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/impl/MdMeMaterialbaseServiceImpl.java
View File

@@ -1,11 +1,14 @@
package org.nl.wms.masterdata_manage.service.material.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
import org.nl.wms.masterdata_manage.service.material.dao.mapper.MdMeMaterialbaseMapper;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 物料基本信息表 服务实现类
@@ -17,4 +20,8 @@ import org.springframework.stereotype.Service;
@Service
public class MdMeMaterialbaseServiceImpl extends ServiceImpl<MdMeMaterialbaseMapper, MdMeMaterialbase> implements IMdMeMaterialbaseService {
@Override
public List getPdaBcpGetMaterial(JSONObject whereJson) {
return this.baseMapper.getPdaBcpGetMaterial(whereJson);
}
}

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/IMpsSaleOrderService.java
View File

@@ -1,10 +1,14 @@
package org.nl.wms.mps_manage.ordermanage.service.saleOrder;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.domain.query.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao.MpsSaleOrder;
import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dto.OrderQuery;
import java.util.List;
import java.util.Map;
/**
* <p>
* 生产订单表 服务类
@@ -21,4 +25,6 @@ public interface IMpsSaleOrderService extends IService<MpsSaleOrder> {
* @return JSONObject
*/
Object pageQuery(OrderQuery query, PageQuery page);
List<Map> getPdaMaterial(JSONObject json);
}

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/MpsSaleOrderMapper.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao.mapper;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.nl.common.domain.query.PageQuery;
@@ -20,4 +21,7 @@ import java.util.Map;
public interface MpsSaleOrderMapper extends BaseMapper<MpsSaleOrder> {
List<Map> pageQuery(@Param("query") OrderQuery query, @Param("pageQuery") PageQuery pageQuery);
List<Map> getPdaMaterial(JSONObject json);
}

36
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/xml/MpsSaleOrderMapper.xml
View File

@@ -8,6 +8,7 @@
mater.material_code,
mater.material_name,
mater.material_spec,
mater.net_weight AS unit_weight,
unit.unit_name AS qty_unit_name
FROM
mps_sale_order der
@@ -34,4 +35,39 @@
</select>
<select id="getPdaMaterial" resultType="java.util.Map">
SELECT
der.*,
mater.material_code,
mater.material_name,
mater.material_spec,
mater.net_weight AS unit_weight,
unit.unit_name AS qty_unit_name
FROM
mps_sale_order der
LEFT JOIN md_me_materialbase mater ON der.material_id = mater.material_id
LEFT JOIN md_pb_measureunit unit ON der.qty_unit_id = unit.measure_unit_id
<where>
der.is_delete = '0'
AND der.status = '10'
<if test="begin_time != null and begin_time != ''">
and der.create_time &lt;= #{begin_time}
</if>
<if test="end_time != null and end_time != ''">
and der.create_time &gt;= #{end_time}
</if>
<if test="sale_code != null and sale_code != ''">
and der.sale_code LIKE '%${sale_code}%'
</if>
<if test="material_code != null and material_code != ''">
and (mater.material_code LIKE '%${material_code}%' or
mater.material_name LIKE '%${material_code}%' or
mater.material_spec LIKE '%${material_code}%')
</if>
</where>
</select>
</mapper>

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/impl/MpsSaleOrderServiceImpl.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.mps_manage.ordermanage.service.saleOrder.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
@@ -33,4 +34,9 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper, Mps
build.setTotalElements(page.getTotal());
return build;
}
@Override
public List<Map> getPdaMaterial(JSONObject json) {
return this.baseMapper.getPdaMaterial(json);
}
}

39
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/PDAEnum.java Normal file
View File

@@ -0,0 +1,39 @@
package org.nl.wms.storage_manage.pda;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.utils.MapOf;
import org.nl.modules.common.exception.BadRequestException;
import java.util.Map;
@AllArgsConstructor
@Getter
public enum PDAEnum {
//点位区域
REGION_CODE(MapOf.of("半成品入库区域", "A1_BCPRK01", "半成品出库区域", "A1_BCPCK01","成品入库区域", "A1_CPRK01","半成品盘点区域", "A1_BCP_PD01")),
//库区编码
SECT_CODE(MapOf.of("半成品库区", "KQ005")),
//库区id
SECT_ID(MapOf.of("成品库区", "1528631043496742912")),
;
private Map<String, String> code;
public String code(String desc) {
String code = this.getCode().get(desc);
if (StringUtils.isNotEmpty(code)) {
return code;
}
throw new BadRequestException(this.name() + "对应类型" + desc + "未定义");
}
public String check(String code) {
for (Map.Entry<String, String> entry : this.getCode().entrySet()) {
if (entry.getValue().equals("code")) {
return entry.getValue();
}
}
throw new BadRequestException(this.name() + "对应类型" + code + "未定义");
}
}

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/PdaStBcpInService.java
View File

@@ -63,4 +63,13 @@ public interface PdaStBcpInService {
* @return JSONObject /
*/
JSONObject confirm(JSONObject whereJson);
/**
* 任务操作
* @param whereJson
* {
* ""
* }
*/
void taskOperate(JSONObject whereJson);
}

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

@@ -7,14 +7,22 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint;
import org.nl.wms.storage_manage.IOSEnum;
import org.nl.wms.storage_manage.pda.PDAEnum;
import org.nl.wms.storage_manage.pda.service.PdaStBcpCheckService;
import org.nl.wms.storage_manage.semimanage.service.check.IStIvtCheckmstBcpService;
import org.nl.wms.storage_manage.semimanage.service.check.dao.StIvtCheckdtlBcp;
import org.nl.wms.storage_manage.semimanage.service.structIvt.IStIvtStructivtBcpService;
import org.nl.wms.system_manage.service.dict.ISysDictService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* <p>
@@ -36,6 +44,15 @@ public class PdaStBcpCheckServiceImpl implements PdaStBcpCheckService {
@Autowired
private ISysDictService iSysDictService; // 字典服务
@Autowired
private IStIvtStructivtBcpService iStIvtStructivtBcpService; // 半成品库存服务
@Autowired
private IStIvtCheckmstBcpService iStIvtCheckmstBcpService; // 半成品盘点主表服务
@Autowired
private ISchBasePointService iSchBasePointService; // 点位服务
@Override
public JSONObject getBcpStor() {
List<StIvtBsrealstorattr> storList = storattrService.list(
@@ -53,46 +70,153 @@ public class PdaStBcpCheckServiceImpl implements PdaStBcpCheckService {
@Override
@Transactional
public JSONObject getMaterialIvt(JSONObject whereJson) {
return null;
List<Map> list = iStIvtStructivtBcpService.getPdaBcpMaterialIvt(whereJson);
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(list)));
result.put("message", "查询成功");
return result;
}
@Override
@Transactional
public JSONObject create(JSONObject whereJson) {
return null;
// 组织主表数据
JSONObject param = new JSONObject();
param.put("check_type", whereJson.getString("check_type"));
param.put("stor_id", whereJson.getString("stor_id"));
param.put("remark", whereJson.getString("remark"));
// 组织明细数据
JSONArray tableData = new JSONArray();
JSONArray rows = whereJson.getJSONArray("rows");
for (int i = 0; i < rows.size(); i++) {
JSONObject json = rows.getJSONObject(i);
JSONObject row = new JSONObject();
row.put("sect_id", json.getString("sect_id"));
row.put("sect_name", json.getString("sect_name"));
row.put("struct_id", json.getString("struct_id"));
row.put("struct_name", json.getString("struct_name"));
row.put("storagevehicle_code", json.getString("storagevehicle_code"));
row.put("material_id", json.getString("material_id"));
row.put("base_qty", json.getString("base_qty"));
row.put("qty_unit_id", json.getString("qty_unit_id"));
row.put("qty_unit_name", json.getString("qty_unit_name"));
tableData.add(row);
}
param.put("tableData",tableData);
iStIvtCheckmstBcpService.create(param);
JSONObject result = new JSONObject();
result.put("data", "");
result.put("message", "生成成功");
return result;
}
@Override
public JSONObject getDtlAll(JSONObject whereJson) {
return null;
List<Map> list = iStIvtCheckmstBcpService.getPdaDtlAll(whereJson);
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(list)));
result.put("message", "查询成功");
return result;
}
@Override
public JSONObject getPoint() {
return null;
List<SchBasePoint> pointList = iSchBasePointService.list(
new QueryWrapper<SchBasePoint>().lambda()
.eq(SchBasePoint::getRegion_code, PDAEnum.REGION_CODE.code("半成品盘点区域"))
.eq(SchBasePoint::getIs_used, IOSEnum.IS_USED.code("是"))
);
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(pointList)));
result.put("message", "查询成功");
return result;
}
@Override
@Transactional
public JSONObject sendTask(JSONObject whereJson) {
return null;
iStIvtCheckmstBcpService.issueTask(whereJson);
JSONObject result = new JSONObject();
result.put("data", "");
result.put("message", "下发成功");
return result;
}
@Override
@Transactional
public JSONObject confirm(JSONObject whereJson) {
return null;
JSONArray rows = whereJson.getJSONArray("rows");
List<StIvtCheckdtlBcp> dtlList = JSON.parseArray(JSON.toJSONString(rows), StIvtCheckdtlBcp.class);
// 根据主表进行分组
Map<String, List<StIvtCheckdtlBcp>> collect = dtlList.stream()
.collect(Collectors.groupingBy(StIvtCheckdtlBcp::getCheck_id));
for (List<StIvtCheckdtlBcp> list : collect.values()) {
// 调用PC确认服务
JSONObject param = new JSONObject();
JSONObject row = new JSONObject();
row.put("check_id", list.get(0).getCheck_id());
param.put("row",row);
param.put("rows", JSONArray.parseArray(JSON.toJSONString(list)));
iStIvtCheckmstBcpService.confirm(param);
}
JSONObject result = new JSONObject();
result.put("data", "");
result.put("message", "确认成功");
return result;
}
@Override
@Transactional
public JSONObject confirmOffer(JSONObject whereJson) {
return null;
JSONObject param = new JSONObject();
JSONObject form = new JSONObject();
form.put("check_id", whereJson.getString("check_id"));
param.put("form",form);
param.put("row", whereJson);
iStIvtCheckmstBcpService.process1(param);
JSONObject result = new JSONObject();
result.put("data", "");
result.put("message", "操作成功");
return result;
}
@Override
@Transactional
public JSONObject confirmFinance(JSONObject whereJson) {
return null;
JSONObject param = new JSONObject();
JSONObject form = new JSONObject();
form.put("check_id", whereJson.getString("check_id"));
param.put("form",form);
param.put("row", whereJson);
iStIvtCheckmstBcpService.process0(param);
JSONObject result = new JSONObject();
result.put("data", "");
result.put("message", "操作成功");
return result;
}
}

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

@@ -1,14 +1,40 @@
package org.nl.wms.storage_manage.pda.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.druid.sql.visitor.functions.If;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.nl.common.enums.AcsTaskEnum;
import org.nl.common.publish.BussEventMulticaster;
import org.nl.common.publish.event.PointEvent;
import org.nl.common.utils.IdUtil;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.masterdata_manage.service.master.IMdPbMeasureunitService;
import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit;
import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
import org.nl.wms.product_manage.sch.manage.TaskStatusEnum;
import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint;
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.IVTEnum;
import org.nl.wms.storage_manage.pda.PDAEnum;
import org.nl.wms.storage_manage.pda.service.PdaStBcpInService;
import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpService;
import org.nl.wms.system_manage.service.dict.ISysDictService;
import org.nl.wms.system_manage.service.dict.dao.Dict;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +42,8 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
/**
* <p>
@@ -37,6 +65,21 @@ public class PdaStBcpInServiceImpl implements PdaStBcpInService {
@Autowired
private ISysDictService iSysDictService; // 字典服务
@Autowired
private IMdMeMaterialbaseService iMdMeMaterialbaseService; // 物料服务
@Autowired
private IMdPbMeasureunitService iMdPbMeasureunitService; // 计量单位服务
@Autowired
private ISchBasePointService iSchBasePointService; // 点位服务
@Autowired
private ISchBaseTaskService iSchBaseTaskService; // 任务服务
@Autowired
private IStIvtIostorinvBcpService iStIvtIostorinvBcpService; // PC半成品入库服务
@Override
public JSONObject getBcpStor() {
List<StIvtBsrealstorattr> storList = storattrService.list(
@@ -63,34 +106,218 @@ public class PdaStBcpInServiceImpl implements PdaStBcpInService {
@Override
public JSONObject getMaterial(JSONObject whereJson) {
return null;
List list = iMdMeMaterialbaseService.getPdaBcpGetMaterial(whereJson);
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(list)));
result.put("message", "查询成功");
return result;
}
@Override
public JSONObject getPoint() {
return null;
List<SchBasePoint> pointList = iSchBasePointService.list(
new QueryWrapper<SchBasePoint>().lambda()
.eq(SchBasePoint::getRegion_code, PDAEnum.REGION_CODE.code("半成品入库区域"))
.eq(SchBasePoint::getIs_used, IOSEnum.IS_USED.code("是"))
);
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(pointList)));
result.put("message", "查询成功");
return result;
}
@Override
@Transactional
public JSONObject callVehicle() {
return null;
// 1.查入库点位
SchBasePoint pointDao = iSchBasePointService.getOne(
new QueryWrapper<SchBasePoint>().lambda()
.eq(SchBasePoint::getRegion_code, PDAEnum.REGION_CODE.code("半成品入库区域"))
.eq(SchBasePoint::getIs_used, IOSEnum.IS_USED.code("是")), false
);
// 2.判断此入库点是否有正在执行的任务
List<SchBaseTask> taskList = iSchBaseTaskService.list(
new QueryWrapper<SchBaseTask>().lambda()
.eq(SchBaseTask::getIs_delete, false)
.ne(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode())
.and(qr -> qr.eq(SchBaseTask::getPoint_code1, pointDao.getPoint_code())
.or()
.eq(SchBaseTask::getPoint_code2, pointDao.getPoint_code())
)
);
if (ObjectUtil.isNotEmpty(taskList)) throw new BadRequestException("有正在执行中的任务，请稍后在尝试！");
// 3.找一个空载具
StIvtStructattr attrDao = structattrService.getOne(
new QueryWrapper<StIvtStructattr>().lambda()
.eq(StIvtStructattr::getIs_emptyvehicle,IOSEnum.IS_USED.code("是"))
.eq(StIvtStructattr::getSect_code, PDAEnum.SECT_CODE.code("半成品库区"))
.eq(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
.eq(StIvtStructattr::getIs_used,true)
.and(qr -> qr.isNotNull(StIvtStructattr::getStoragevehicle_code)
.or()
.ne(StIvtStructattr::getStoragevehicle_code, "")
),false
);
if (ObjectUtil.isEmpty(attrDao)) throw new BadRequestException("未找到空载具！");
// 4.创建任务
PointEvent event = PointEvent.builder()
.type(AcsTaskEnum.TASK_STRUCT_BCP_EMPOUT.getCode())
.acs_task_type("7")
.task_group_id(IdUtil.getStringId())
.point_code1(attrDao.getStruct_code())
.point_code2(pointDao.getPoint_code())
.vehicle_code(attrDao.getStoragevehicle_code())
.product_area("A1") // 暂时写死
.build();
BussEventMulticaster.Publish(event);
// 5.锁住仓位
attrDao.setLock_type(IOSEnum.LOCK_TYPE.code("其他锁"));
structattrService.updateById(attrDao);
// 6.下发任务
String task_id = iSchBaseTaskService.getOne(
new QueryWrapper<SchBaseTask>().lambda()
.eq(SchBaseTask::getTask_group_id, event.getTask_group_id())
).getTask_id();
sendTask(task_id);
// 反馈
JSONObject result = new JSONObject();
result.put("data", "");
result.put("message", "下发成功");
return result;
}
@Override
@Transactional
public JSONObject createIn(JSONObject whereJson) {
return null;
// 组织数据
JSONObject param = new JSONObject();
param.put("biz_date", DateUtil.today());
param.put("bill_type", whereJson.getString("bill_type"));
param.put("remark", whereJson.getString("remark"));
param.put("product_code", "A1");
param.put("point_code", whereJson.getString("point_code"));
param.put("stor_id", whereJson.getString("stor_id"));
param.put("auto_send", true);
JSONArray tableData = new JSONArray();
JSONObject row = new JSONObject();
row.put("material_id", whereJson.getString("material_id"));
row.put("plan_qty", whereJson.getString("total_qty"));
row.put("quality_scode", IVTEnum.QUALITY_SCODE.code("合格品"));
MdMeMaterialbase materDao = iMdMeMaterialbaseService.getById(whereJson.getString("material_id"));
MdPbMeasureunit unitDao = iMdPbMeasureunitService.getById(materDao.getBase_unit_id());
row.put("base_unit_id", unitDao.getMeasure_unit_id());
row.put("base_unit_name", unitDao.getUnit_name());
row.put("unit_weight", whereJson.getString("unit_weight"));
row.put("storagevehicle_code", whereJson.getString("storagevehicle_code"));
tableData.add(row);
param.put("tableData",tableData);
// 调用PC半成品入库服务
iStIvtIostorinvBcpService.create(param);
// 反馈
JSONObject result = new JSONObject();
result.put("data", "");
result.put("message", "入库成功");
return result;
}
@Override
public JSONObject getAll(JSONObject whereJson) {
return null;
whereJson.put("io_type", IOSEnum.IO_TYPE.code("入库"));
List<Map> pdaAll = iStIvtIostorinvBcpService.getPdaAll(whereJson);
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(pdaAll)));
result.put("message", "查询成功");
return result;
}
@Override
@Transactional
public JSONObject confirm(JSONObject whereJson) {
return null;
iStIvtIostorinvBcpService.confirm(whereJson);
JSONObject result = new JSONObject();
result.put("data", "");
result.put("message", "确认成功");
return result;
}
@Override
public void taskOperate(JSONObject form) {
String task_id = form.getString("task_id");
String status = form.getString("status");
SchBaseTask taskDao = iSchBaseTaskService.getById(task_id);
// 更新任务状态为完成
if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) {
// 更新任务为完成
taskDao.setTask_status(TaskStatusEnum.FINISHED.getCode());
// 解锁仓位
structattrService.update(
new UpdateWrapper<StIvtStructattr>().lambda()
.set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
.eq(StIvtStructattr::getStruct_code, taskDao.getPoint_code1())
);
} else if (status.equals(AcsTaskEnum.STATUS_START.getCode())) {
// 更新任务为执行中
taskDao.setTask_status(TaskStatusEnum.EXECUTING.getCode());
} else if (status.equals(AcsTaskEnum.STATUS_CANNEL.getCode())) {
// 取消任务
taskDao.setTask_status(TaskStatusEnum.CANCEL.getCode());
// 解锁仓位
structattrService.update(
new UpdateWrapper<StIvtStructattr>().lambda()
.set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
.eq(StIvtStructattr::getStruct_code, taskDao.getPoint_code1())
);
}
iSchBaseTaskService.updateById(taskDao);
}
public void sendTask(String task_id) {
SchBaseTask taskDao = iSchBaseTaskService.getById(task_id);
JSONArray param = new JSONArray();
param.add(JSON.parseObject(JSONUtil.toJsonStr(taskDao)));
// 1.下发任务
WmsToAcsService bean = SpringContextHolder.getBean(WmsToAcsService.class);
Map<String, Object> result = bean.issueTaskToAcs3(param);
// 反馈失败报错
if (!ObjectUtil.equal(MapUtil.getStr(result, "status"),"200")) {
throw new BadRequestException("下发失败："+MapUtil.getStr(result, "message"));
}
// 2.更新任务状态
taskDao.setTask_status(TaskStatusEnum.ISSUE.getCode());
iSchBaseTaskService.updateById(taskDao);
}
}

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

@@ -1,14 +1,28 @@
package org.nl.wms.storage_manage.pda.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.nl.wms.masterdata_manage.service.master.IMdPbMeasureunitService;
import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit;
import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint;
import org.nl.wms.storage_manage.IOSEnum;
import org.nl.wms.storage_manage.IVTEnum;
import org.nl.wms.storage_manage.pda.PDAEnum;
import org.nl.wms.storage_manage.pda.service.PdaStBcpOutService;
import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpOutService;
import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpService;
import org.nl.wms.storage_manage.semimanage.service.structIvt.IStIvtStructivtBcpService;
import org.nl.wms.system_manage.service.dict.ISysDictService;
import org.nl.wms.system_manage.service.dict.dao.Dict;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +30,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -37,6 +52,24 @@ public class PdaStBcpOutServiceImpl implements PdaStBcpOutService {
@Autowired
private ISysDictService iSysDictService; // 字典服务
@Autowired
private IStIvtStructivtBcpService iStIvtStructivtBcpService; // 半成品库存服务
@Autowired
private ISchBasePointService iSchBasePointService; // 点位服务
@Autowired
private IMdMeMaterialbaseService iMdMeMaterialbaseService; // 物料服务
@Autowired
private IMdPbMeasureunitService iMdPbMeasureunitService; // 计量单位服务
@Autowired
private IStIvtIostorinvBcpOutService iStIvtIostorinvBcpOutService; // 半成品出库服务
@Autowired
private IStIvtIostorinvBcpService iStIvtIostorinvBcpService; // PC半成品入库服务
@Override
public JSONObject getBcpStor() {
List<StIvtBsrealstorattr> storList = storattrService.list(
@@ -53,7 +86,7 @@ public class PdaStBcpOutServiceImpl implements PdaStBcpOutService {
@Override
public JSONObject getBillType() {
List<Dict> dictList = iSysDictService.getDictByName("ST_INV_BCP_IN_TYPE");
List<Dict> dictList = iSysDictService.getDictByName("ST_INV_BCP_OUT_TYPE");
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(dictList)));
@@ -63,28 +96,100 @@ public class PdaStBcpOutServiceImpl implements PdaStBcpOutService {
@Override
public JSONObject getMaterial(JSONObject whereJson) {
return null;
List<Map> list = iStIvtStructivtBcpService.getPdaBcpIvt(whereJson);
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(list)));
result.put("message", "查询成功");
return result;
}
@Override
public JSONObject getPoint() {
return null;
List<SchBasePoint> pointList = iSchBasePointService.list(
new QueryWrapper<SchBasePoint>().lambda()
.eq(SchBasePoint::getRegion_code, PDAEnum.REGION_CODE.code("半成品出库区域"))
.eq(SchBasePoint::getIs_used, IOSEnum.IS_USED.code("是"))
);
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(pointList)));
result.put("message", "查询成功");
return result;
}
@Override
@Transactional
public JSONObject createIn(JSONObject whereJson) {
return null;
// 组织数据
JSONObject param = new JSONObject();
param.put("biz_date", DateUtil.today());
param.put("bill_type", whereJson.getString("bill_type"));
param.put("remark", whereJson.getString("remark"));
param.put("product_code", "A1");
param.put("point_code", whereJson.getString("point_code"));
param.put("stor_id", whereJson.getString("stor_id"));
param.put("auto_send", true);
JSONArray tableData = new JSONArray();
JSONObject row = new JSONObject();
row.put("material_id", whereJson.getString("material_id"));
row.put("plan_qty", whereJson.getString("total_qty"));
row.put("quality_scode", IVTEnum.QUALITY_SCODE.code("合格品"));
MdMeMaterialbase materDao = iMdMeMaterialbaseService.getById(whereJson.getString("material_id"));
MdPbMeasureunit unitDao = iMdPbMeasureunitService.getById(materDao.getBase_unit_id());
row.put("qty_unit_id", unitDao.getMeasure_unit_id());
row.put("qty_unit_name", unitDao.getUnit_name());
row.put("unit_weight", whereJson.getString("unit_weight"));
row.put("storagevehicle_code", whereJson.getString("storagevehicle_code"));
StIvtStructattr attrDao = structattrService.getOne(
new QueryWrapper<StIvtStructattr>().lambda()
.eq(StIvtStructattr::getStruct_code, whereJson.getString("struct_code"))
.eq(StIvtStructattr::getIs_used, IOSEnum.IS_USED.code("是")), false
);
row.put("sect_id", attrDao.getSect_id());
row.put("sect_code", attrDao.getSect_code());
row.put("sect_name", attrDao.getSect_name());
row.put("struct_id", attrDao.getStruct_id());
row.put("struct_code", attrDao.getStruct_code());
row.put("struct_name", attrDao.getStruct_name());
tableData.add(row);
param.put("tableData",tableData);
// 调用PC半成品出库服务
iStIvtIostorinvBcpOutService.create(param);
// 反馈
JSONObject result = new JSONObject();
result.put("data", "");
result.put("message", "出库成功");
return result;
}
@Override
public JSONObject getAll(JSONObject whereJson) {
return null;
whereJson.put("io_type", IOSEnum.IO_TYPE.code("出库"));
List<Map> pdaAll = iStIvtIostorinvBcpService.getPdaAll(whereJson);
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(pdaAll)));
result.put("message", "查询成功");
return result;
}
@Override
@Transactional
public JSONObject confirm(JSONObject whereJson) {
return null;
iStIvtIostorinvBcpOutService.confirm(whereJson);
JSONObject result = new JSONObject();
result.put("data", "");
result.put("message", "确认成功");
return result;
}
}

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

@@ -9,12 +9,15 @@ import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrServ
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
import org.nl.wms.storage_manage.IOSEnum;
import org.nl.wms.storage_manage.pda.service.PdaStBcpShutService;
import org.nl.wms.storage_manage.semimanage.service.shutFrame.IStIvtShutframeinvBcpService;
import org.nl.wms.system_manage.service.dict.ISysDictService;
import org.nl.wms.system_manage.service.dict.dao.Dict;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -27,15 +30,15 @@ import java.util.List;
@Service
public class PdaStBcpShutServiceImpl implements PdaStBcpShutService {
@Autowired
private IStIvtStructattrService structattrService; // 仓位服务
@Autowired
private IStIvtBsrealstorattrService storattrService; // 实物属性服务
@Autowired
private ISysDictService iSysDictService; // 字典服务
@Autowired
private IStIvtShutframeinvBcpService iStIvtShutframeinvBcpService; // 半成品拼盘服务
@Override
public JSONObject getBcpStor() {
List<StIvtBsrealstorattr> storList = storattrService.list(
@@ -52,17 +55,32 @@ public class PdaStBcpShutServiceImpl implements PdaStBcpShutService {
@Override
public JSONObject getBillType() {
return null;
List<Dict> dictList = iSysDictService.getDictByName("SHUTFRAME_BILL_STATUS");
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(dictList)));
result.put("message", "查询成功");
return result;
}
@Override
public JSONObject getdtl(JSONObject whereJson) {
return null;
List<Map> list = iStIvtShutframeinvBcpService.getPdaAll(whereJson);
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(list)));
result.put("message", "查询成功");
return result;
}
@Override
@Transactional
public JSONObject confirm(JSONObject whereJson) {
return null;
iStIvtShutframeinvBcpService.confirmOne(whereJson);
JSONObject result = new JSONObject();
result.put("data", "");
result.put("message", "拼盘成功");
return result;
}
}

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

@@ -1,14 +1,25 @@
package org.nl.wms.storage_manage.pda.service.impl;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.nl.modules.system.util.CodeUtil;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
import org.nl.wms.mps_manage.ordermanage.service.saleOrder.IMpsSaleOrderService;
import org.nl.wms.scheduler_manage.service.point.ISchBasePointService;
import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint;
import org.nl.wms.storage_manage.IOSEnum;
import org.nl.wms.storage_manage.pda.PDAEnum;
import org.nl.wms.storage_manage.pda.service.PdaStCpInService;
import org.nl.wms.storage_manage.productmanage.service.iostorInv.IStIvtIostorinvCpService;
import org.nl.wms.storage_manage.productmanage.service.iostorInv.IStIvtIostorinvdisCpService;
import org.nl.wms.storage_manage.productmanage.service.iostorInv.IStIvtIostorinvdtlCpService;
import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvdisCp;
import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvdtlCp;
import org.nl.wms.system_manage.service.dict.ISysDictService;
import org.nl.wms.system_manage.service.dict.dao.Dict;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +27,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -37,12 +49,27 @@ public class PdaStCpInServiceImpl implements PdaStCpInService {
@Autowired
private ISysDictService iSysDictService; // 字典服务
@Autowired
private ISchBasePointService iSchBasePointService; // 点位服务
@Autowired
private IMpsSaleOrderService iMpsSaleOrderService; // 订单服务
@Autowired
private IStIvtIostorinvCpService iStIvtIostorinvCpService; // 成品入库服务
@Autowired
protected IStIvtIostorinvdtlCpService iostorinvdtlCpService; // 成品出入库明细表服务
@Autowired
protected IStIvtIostorinvdisCpService iostorinvdisCpService; // 成品出入库分配表服务
@Override
public JSONObject getBcpStor() {
List<StIvtBsrealstorattr> storList = storattrService.list(
new QueryWrapper<StIvtBsrealstorattr>().lambda()
.eq(StIvtBsrealstorattr::getIs_used, IOSEnum.IS_USED.code("是"))
.eq(StIvtBsrealstorattr::getStor_id, IOSEnum.STOR_CODE.code("半成品仓库"))
.eq(StIvtBsrealstorattr::getStor_id, IOSEnum.STOR_CODE.code("成品库"))
);
JSONObject result = new JSONObject();
@@ -53,7 +80,7 @@ public class PdaStCpInServiceImpl implements PdaStCpInService {
@Override
public JSONObject getBillType() {
List<Dict> dictList = iSysDictService.getDictByName("ST_INV_BCP_IN_TYPE");
List<Dict> dictList = iSysDictService.getDictByName("ST_INV_CP_IN_TYPE");
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(dictList)));
@@ -63,29 +90,225 @@ public class PdaStCpInServiceImpl implements PdaStCpInService {
@Override
public JSONObject getPoint() {
return null;
List<SchBasePoint> pointList = iSchBasePointService.list(
new QueryWrapper<SchBasePoint>().lambda()
.eq(SchBasePoint::getRegion_code, PDAEnum.REGION_CODE.code("成品入库区域"))
.eq(SchBasePoint::getIs_used, IOSEnum.IS_USED.code("是"))
);
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(pointList)));
result.put("message", "查询成功");
return result;
}
@Override
public JSONObject getMaterial(JSONObject whereJson) {
return null;
List<Map> list = iMpsSaleOrderService.getPdaMaterial(whereJson);
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(list)));
result.put("message", "查询成功");
return result;
}
@Override
@Transactional
public JSONObject confirmIn(JSONObject whereJson) {
return null;
/*
* 入库单创建
*/
// 1.组织入库数据
JSONObject paramIn = createInData(whereJson);
// 2.调用PC成品入库服务创建入库单
String iostorinv_id = iStIvtIostorinvCpService.createPda(paramIn);
/*
* 组盘
*/
// 1.组织拼盘数据
whereJson.put("iostorinv_id", iostorinv_id);
JSONObject paramVehicle = createVehicleData(whereJson);
// 2.调用PC成品入库服务拼盘
iStIvtIostorinvCpService.confirmvehicle(paramVehicle);
/*
* 分配货位
*/
// 1.组织分配货位数据
JSONObject paramDiv = createDivData(whereJson);
// 2.调用PC成品入库服务分配货位
iStIvtIostorinvCpService.divStruct(whereJson);
/*
* 设置起点
*/
// 1.组织设置起点数据
JSONObject paramPoint = createPointData(whereJson);
// 2.调用PC成品入库服务设置起点
iStIvtIostorinvCpService.setPoint(paramPoint);
/*
* 下发任务
*/
// 1.组织下发任务数据
JSONObject paramTask = createTaskData(whereJson);
// 2.调用PC成品入库服务下发任务
iStIvtIostorinvCpService.sendTask(paramTask);
JSONObject result = new JSONObject();
result.put("data", "");
result.put("message", "入库成功");
return result;
}
@Override
public JSONObject getAll(JSONObject whereJson) {
return null;
List<Map> list = iStIvtIostorinvCpService.getPdaAll(whereJson);
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(list)));
result.put("message", "查询成功");
return result;
}
@Override
@Transactional
public JSONObject confirm(JSONObject whereJson) {
return null;
iStIvtIostorinvCpService.confirm(whereJson);
JSONObject result = new JSONObject();
result.put("data", "");
result.put("message", "确认成功");
return result;
}
/**
* 组织入库数据
* @param whereJson /
* @return JSONObject
*/
public JSONObject createInData(JSONObject whereJson) {
// 1.组织主表数据
JSONObject param = new JSONObject();
param.put("bill_type", whereJson.getString("bill_type"));
param.put("biz_date", DateUtil.today());
param.put("stor_id", whereJson.getString("stor_id"));
param.put("point_code", whereJson.getString("point_code"));
param.put("remark", whereJson.getString("remark"));
// 2.组织明细数据
JSONArray tableData = new JSONArray();
double total_qty = 0;
JSONArray rows = whereJson.getJSONArray("rows");
for (int i = 0; i < rows.size(); i++) {
JSONObject json = rows.getJSONObject(i);
JSONObject row = new JSONObject();
row.put("base_bill_code", json.getString("sale_code"));
row.put("base_bill_table", json.getString("seq_no"));
row.put("material_code", json.getString("material_code"));
row.put("plan_qty", json.getString("sale_qty"));
row.put("qty_unit_id", json.getString("qty_unit_id"));
row.put("qty_unit_name", json.getString("qty_unit_name"));
row.put("unit_weight", json.getString("unit_weight"));
total_qty += json.getDoubleValue("sale_qty");
tableData.add(row);
}
param.put("total_qty", total_qty);
param.put("tableData",tableData);
return param;
}
/**
* 组织拼盘数据
* @param whereJson /
* @return JSONObject
*/
public JSONObject createVehicleData(JSONObject whereJson) {
JSONObject param = new JSONObject();
param.put("vehicle_code", CodeUtil.getNewCode("VEHICCLE_CODE_CDMTP"));
JSONArray tableMater = new JSONArray();
// 查找明细
List<StIvtIostorinvdtlCp> dtlList = iostorinvdtlCpService.list(
new QueryWrapper<StIvtIostorinvdtlCp>().lambda()
.eq(StIvtIostorinvdtlCp::getIostorinv_id, whereJson.getString("iostorinv_id"))
);
for (StIvtIostorinvdtlCp dao : dtlList) {
JSONObject row = new JSONObject();
row.put("storagevehicle_code", param.getString("vehicle_code"));
row.put("iostorinvdtl_id", dao.getIostorinvdtl_id());
row.put("material_id", dao.getMaterial_id());
row.put("qty", dao.getPlan_qty());
tableMater.add(row);
}
param.put("tableMater",tableMater);
return param;
}
/**
* 组织分配数据
* @param whereJson /
* @return JSONObject
*/
public JSONObject createDivData(JSONObject whereJson) {
// 查找一条分配
StIvtIostorinvdisCp disDao = iostorinvdisCpService.getOne(
new QueryWrapper<StIvtIostorinvdisCp>().lambda()
.eq(StIvtIostorinvdisCp::getIostorinv_id, whereJson.getString("iostorinv_id")),
false
);
JSONObject param = JSONObject.parseObject(JSON.toJSONString(disDao));
param.put("vehicle_overstruct_type",IOSEnum.VEHICLE_OVER_TYPE.code("标准"));
param.put("stor_id",IOSEnum.STOR_CODE.code("成品库"));
param.put("sect_id",PDAEnum.SECT_ID.code("成品库区"));
return param;
}
/**
* 组织设置起点数据
* @param whereJson /
* @return JSONObject
*/
public JSONObject createPointData(JSONObject whereJson) {
// 查找一条分配
StIvtIostorinvdisCp disDao = iostorinvdisCpService.getOne(
new QueryWrapper<StIvtIostorinvdisCp>().lambda()
.eq(StIvtIostorinvdisCp::getIostorinv_id, whereJson.getString("iostorinv_id")),
false
);
JSONObject param = JSONObject.parseObject(JSON.toJSONString(disDao));
param.put("point_code",whereJson.getString("point_code"));
return param;
}
/**
* 组织下发任务数据
* @param whereJson /
* @return JSONObject
*/
public JSONObject createTaskData(JSONObject whereJson) {
// 查找一条分配
StIvtIostorinvdisCp disDao = iostorinvdisCpService.getOne(
new QueryWrapper<StIvtIostorinvdisCp>().lambda()
.eq(StIvtIostorinvdisCp::getIostorinv_id, whereJson.getString("iostorinv_id")),
false
);
return JSONObject.parseObject(JSON.toJSONString(disDao));
}
}

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpService.java
View File

@@ -7,6 +7,7 @@ import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostor
import org.nl.wms.storage_manage.productmanage.service.iostorInv.dto.IostorInvQuery;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -31,6 +32,12 @@ public interface IStIvtIostorinvCpService extends IService<StIvtIostorinvCp> {
*/
void create(JSONObject form);
/**
* 一体机创建
* @param form /
*/
String createPda(JSONObject form);
/**
* 更新相关联的表
* @param form /
@@ -189,4 +196,6 @@ public interface IStIvtIostorinvCpService extends IService<StIvtIostorinvCp> {
* }
*/
void confirmTask(JSONObject whereJson);
List<Map> getPdaAll(JSONObject whereJson);
}

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/StIvtIostorinvCpMapper.java
View File

@@ -1,8 +1,12 @@
package org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.mapper;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvCp;
import java.util.List;
import java.util.Map;
/**
* <p>
* 出入库单主表 Mapper 接口
@@ -13,4 +17,6 @@ import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostor
*/
public interface StIvtIostorinvCpMapper extends BaseMapper<StIvtIostorinvCp> {
List<Map> getPdaAll(JSONObject whereJson);
}

54
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvCpMapper.xml
View File

@@ -2,4 +2,58 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.mapper.StIvtIostorinvCpMapper">
<select id="getPdaAll" resultType="java.util.Map">
SELECT
mst.*,
dis.material_code,
dis.material_name,
dis.net_weight,
dis.point_code,
dis.struct_code,
dis.storagevehicle_code
FROM
st_ivt_iostorinv_cp mst
LEFT JOIN (
SELECT
a.iostorinv_id,
MAX(b.material_code) AS material_code,
MAX(b.material_name) AS material_name,
MAX(b.net_weight) AS net_weight,
MAX(a.point_code) AS point_code,
MAX(a.struct_code) AS struct_code,
MAX(a.storagevehicle_code) AS storagevehicle_code
FROM
st_ivt_iostorinvdis_cp a
LEFT JOIN md_me_materialbase b ON a.material_id = b.material_id
WHERE
1 = 1
group by a.iostorinv_id
) dis ON dis.iostorinv_id = mst.iostorinv_id
<where>
mst.is_delete = '0'
AND mst.bill_status != '99'
<if test="stor_id != null and stor_id != ''">
and mst.stor_id = #{stor_id}
</if>
<if test="begin_time != null and begin_time != ''">
and mst.create_time &lt;= #{begin_time}
</if>
<if test="end_time != null and end_time != ''">
and mst.create_time &gt;= #{end_time}
</if>
<if test="bill_type != null and bill_type != ''">
and mst.bill_type = #{bill_type}
</if>
<if test="storagevehicle_code != null and storagevehicle_code != ''">
and dis.storagevehicle_code LIKE '%${storagevehicle_code}%'
</if>
<if test="material_code != null and material_code != ''">
and (dis.material_code LIKE '%${material_code}%' or
dis.material_name LIKE '%${material_code}%')
</if>
</where>
order by mst.create_time DESC
</select>
</mapper>

23
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
View File

@@ -154,6 +154,24 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl<StIvtIostorinvCpMap
iostorinvdtlCpService.create(rows, stIvtIostorinvCp.getIostorinv_id());
}
@Override
@Transactional(rollbackFor = Exception.class)
public String createPda(JSONObject form) {
JSONArray rows = form.getJSONArray("tableData");
if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空");
// 调用主表 插入/更新方法
StIvtIostorinvCp stIvtIostorinvCp = packageMstForm(new StIvtIostorinvCp(), form, false);
// 插入主表
this.save(stIvtIostorinvCp);
// 调用明细表 插入/更新方法
iostorinvdtlCpService.create(rows, stIvtIostorinvCp.getIostorinv_id());
return stIvtIostorinvCp.getIostorinv_id();
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(JSONObject form) {
@@ -897,6 +915,11 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl<StIvtIostorinvCpMap
taskOperate(whereJson);
}
@Override
public List<Map> getPdaAll(JSONObject whereJson) {
return this.baseMapper.getPdaAll(whereJson);
}
@NotNull
private StIvtIostorinvCp packageMstForm(StIvtIostorinvCp stIvtIostorinvCp,JSONObject whereJson,Boolean isUpdate) {
JSONArray rows = whereJson.getJSONArray("tableData");

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/TASKEnum.java
View File

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
import org.nl.common.enums.AcsTaskEnum;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.storage_manage.pda.service.PdaStBcpInService;
import org.nl.wms.storage_manage.productmanage.service.check.IStIvtCheckmstCpService;
import org.nl.wms.storage_manage.productmanage.service.iostorInv.IStIvtIostorinvCpOutService;
import org.nl.wms.storage_manage.productmanage.service.iostorInv.IStIvtIostorinvCpService;
@@ -40,6 +41,10 @@ public enum TASKEnum implements FunctionStrategy<String, JSONObject> {
IStIvtShutframeinvBcpService bean = SpringContextHolder.getBean(IStIvtShutframeinvBcpService.class);
bean.taskOperate2(form);
}),
EMP_TASK_OUT(type -> AcsTaskEnum.TASK_STRUCT_BCP_EMPOUT.getCode().equals(type), form -> {
PdaStBcpInService bean = SpringContextHolder.getBean(PdaStBcpInService.class);
bean.taskOperate(form);
}),
CP_IN_TASK(type -> AcsTaskEnum.TASK_STRUCT_CP_IN.getCode().equals(type), form -> {
IStIvtIostorinvCpService bean = SpringContextHolder.getBean(IStIvtIostorinvCpService.class);
bean.taskOperate(form);

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/IStIvtCheckmstBcpService.java
View File

@@ -52,4 +52,6 @@ public interface IStIvtCheckmstBcpService extends IService<StIvtCheckmstBcp> {
void issueTask(JSONObject jo);
void taskOperate(JSONObject jo);
List<Map> getPdaDtlAll(JSONObject jo);
}

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/dao/mapper/StIvtCheckmstBcpMapper.java
View File

@@ -1,8 +1,12 @@
package org.nl.wms.storage_manage.semimanage.service.check.dao.mapper;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.storage_manage.semimanage.service.check.dao.StIvtCheckmstBcp;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import java.util.Map;
/**
* <p>
* 盘点单主表 Mapper 接口
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface StIvtCheckmstBcpMapper extends BaseMapper<StIvtCheckmstBcp> {
List<Map> getPdaDtlAll(JSONObject jo);
}

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/dao/mapper/xml/StIvtCheckdtlBcpMapper.xml
View File

@@ -43,10 +43,15 @@
dtl.*
FROM
sch_base_task task
LEFT JOIN st_ivt_structattr sa ON sa.struct_code = task.point_code2
LEFT JOIN st_ivt_structattr sa ON (sa.struct_code = task.point_code2 OR sa.struct_code = task.point_code1)
LEFT JOIN st_ivt_checkdtl_bcp dtl ON dtl.struct_id = sa.struct_id
LEFT JOIN st_ivt_checkmst_bcp mst ON mst.check_id = dtl.check_id
<where>
task.task_id = #{map.task_id}
AND
dtl.`status` not IN ('01','99')
AND
mst.is_delete = '0'
</where>
</select>
</mapper>

42
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/dao/mapper/xml/StIvtCheckmstBcpMapper.xml
View File

@@ -2,4 +2,46 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.storage_manage.semimanage.service.check.dao.mapper.StIvtCheckmstBcpMapper">
<select id="getPdaDtlAll" resultType="java.util.Map">
SELECT
dtl.*,
mb.material_code,
mb.material_spec,
dtl.base_qty / mb.net_weight AS qty,
mst.check_type,
mst.create_time,
mst.create_name
FROM
st_ivt_checkdtl_bcp dtl
LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
LEFT JOIN st_ivt_structattr attr ON attr.struct_id = dtl.struct_id
LEFT JOIN st_ivt_checkmst_bcp mst ON mst.check_id = dtl.check_id
<where>
mst.is_delete = '0'
AND
mst.status != '99'
AND
dtl.status != '99'
<if test="stor_id != null and stor_id != ''">
and mst.stor_id = #{stor_id}
</if>
<if test="begin_time != null and begin_time != ''">
and mst.create_time &lt;= #{begin_time}
</if>
<if test="end_time != null and end_time != ''">
and mst.create_time &gt;= #{end_time}
</if>
<if test="material_code != null and material_code != ''">
and (mb.material_code LIKE '%${material_code}%' or
mb.material_name LIKE '%${material_code}%')
</if>
<if test="struct_code != null and struct_code != ''">
and (attr.struct_code LIKE '%${struct_code}%' or
attr.struct_name LIKE '%${struct_code}%')
</if>
<if test="storagevehicle_code != null and storagevehicle_code != ''">
and attr.struct_code LIKE '%${storagevehicle_code}%'
</if>
</where>
</select>
</mapper>

186
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java
View File

@@ -38,6 +38,8 @@ import org.nl.wms.scheduler_manage.service.point.dao.mapper.SchBasePointMapper;
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.CHECKEnum;
import org.nl.wms.storage_manage.IOSEnum;
import org.nl.wms.storage_manage.pda.PDAEnum;
import org.nl.wms.storage_manage.semimanage.MLEnum;
import org.nl.wms.storage_manage.semimanage.service.check.IStIvtCheckdtlBcpService;
import org.nl.wms.storage_manage.semimanage.service.check.IStIvtCheckmstBcpService;
@@ -46,6 +48,7 @@ import org.nl.wms.storage_manage.semimanage.service.check.dao.StIvtCheckmstBcp;
import org.nl.wms.storage_manage.semimanage.service.check.dao.mapper.StIvtCheckdtlBcpMapper;
import org.nl.wms.storage_manage.semimanage.service.check.dao.mapper.StIvtCheckmstBcpMapper;
import org.nl.wms.storage_manage.semimanage.service.check.dto.CheckQuery;
import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp;
import org.nl.wms.storage_manage.semimanage.service.moveOrLess.IStIvtMoreorlessmstBcpService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -56,6 +59,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* <p>
@@ -83,9 +87,13 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl<StIvtCheckmstBcpMap
@Autowired
private SchBasePointMapper pointMapper;
@Autowired
private ISchBasePointService iSchBasePointService;
@Autowired
private ISchBasePointService pointService;
@Autowired
private ISchBaseTaskService taskService;
@Autowired
private ISchBaseTaskService iSchBaseTaskService; // 任务表服务
@Override
public Object pageQuery(CheckQuery query, PageQuery page) {
@@ -225,6 +233,15 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl<StIvtCheckmstBcpMap
}
checkdtlBcpService.save(dtl);
set.add(dtl.getStruct_id());
// 判断是否已下发，是则生成回去的任务
if (dtl.getIs_down().equals("1") && dtl.getStatus().equals(CHECKEnum.DTL_STATUS.code("确认完成"))) {
createBackTask(dtl,jo_mst.getWorkshop_id());
dtl.setStatus(CHECKEnum.DTL_STATUS.code("已盘点"));
dtl.setIs_down("2");
checkdtlBcpService.updateById(dtl);
}
}
jo_mst.setDtl_num(BigDecimal.valueOf(rows.size()));
@@ -237,18 +254,54 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl<StIvtCheckmstBcpMap
List<StIvtCheckdtlBcp> finish_list = checkdtlBcpService.list(new QueryWrapper<StIvtCheckdtlBcp>().eq("check_id", form.getString("check_id")).in("status", new String[]{"99", "07"}));
//说明全部确认
if (finish_list.size() == jo_mst.getDtl_num().intValue()) {
checkdtlBcpService.update(new UpdateWrapper<StIvtCheckdtlBcp>().set("status", "99").eq("check_id", form.getString("check_id")));
// 判断是否有任务
List<StIvtCheckdtlBcp> collect = finish_list.stream()
.filter(item -> Integer.parseInt(item.getIs_down()) > 0)
.collect(Collectors.toList());
if (ObjectUtil.isEmpty(collect)) {
checkdtlBcpService.update(new UpdateWrapper<StIvtCheckdtlBcp>().set("status", "99").eq("check_id", form.getString("check_id")));
jo_mst.setStatus(CHECKEnum.BILL_STATUS.code("完成"));
jo_mst.setConfirm_optid(SecurityUtils.getCurrentUserId());
jo_mst.setConfirm_optname(SecurityUtils.getCurrentNickName());
jo_mst.setConfirm_time(DateUtil.now());
//锁定起点点位、仓位
set.forEach(struct_id -> structattrService.update(new UpdateWrapper<StIvtStructattr>().set("lock_type", "0").set("inv_code", "").eq("struct_id", struct_id)));
}
jo_mst.setStatus(CHECKEnum.BILL_STATUS.code("完成"));
jo_mst.setConfirm_optid(SecurityUtils.getCurrentUserId());
jo_mst.setConfirm_optname(SecurityUtils.getCurrentNickName());
jo_mst.setConfirm_time(DateUtil.now());
//锁定起点点位、仓位
set.forEach(struct_id -> structattrService.update(new UpdateWrapper<StIvtStructattr>().set("lock_type", "0").set("inv_code", "").eq("struct_id", struct_id)));
}
this.updateById(jo_mst);
}
/*
创建回去的任务
*/
private void createBackTask(StIvtCheckdtlBcp dtl,String product_area) {
String task_group_id = IdUtil.getStringId();
StIvtStructattr attrDao = structattrService.getById(dtl.getStruct_id());
PointEvent event = PointEvent.builder()
.acs_task_type("7")
.type(AcsTaskEnum.TASK_STRUCT_CHECK.getCode())
.point_code1(dtl.getCheckpoint_id())
.point_code2(attrDao.getStruct_code())
.vehicle_code(dtl.getStoragevehicle_code())
.task_group_id(task_group_id)
.product_area(product_area)
.build();
BussEventMulticaster.Publish(event);
// 下发任务
List<SchBaseTask> taskList = taskService.list(
new QueryWrapper<SchBaseTask>().lambda()
.eq(SchBaseTask::getTask_group_id, task_group_id)
);
taskList.forEach(this::sendTask);
}
@Override
@Transactional
@@ -266,21 +319,36 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl<StIvtCheckmstBcpMap
dtl.setProcess_time(DateUtil.now());
dtl.setProcess_type(CHECKEnum.PROCESS_TYPE.code("账务为准"));
dtl.setIs_process(true);
// 判断是否已下发，是则生成回去的任务
if (dtl.getIs_down().equals("1")) {
createBackTask(dtl,jo_mst.getWorkshop_id());
dtl.setStatus(CHECKEnum.DTL_STATUS.code("异常处理完成"));
dtl.setIs_down("2");
}
checkdtlBcpService.updateById(dtl);
List<StIvtCheckdtlBcp> finish_list = checkdtlBcpService.list(new QueryWrapper<StIvtCheckdtlBcp>().eq("check_id", form.getString("check_id")).in("status", new String[]{"99", "07"}));
//说明全部确认
if (finish_list.size() == jo_mst.getDtl_num().intValue()) {
checkdtlBcpService.update(new UpdateWrapper<StIvtCheckdtlBcp>().set("status", "99").eq("check_id", form.getString("check_id")));
// 判断是否有任务
List<StIvtCheckdtlBcp> collect = finish_list.stream()
.filter(item -> Integer.parseInt(item.getIs_down()) > 0)
.collect(Collectors.toList());
jo_mst.setStatus(CHECKEnum.BILL_STATUS.code("完成"));
jo_mst.setConfirm_optid(SecurityUtils.getCurrentUserId());
jo_mst.setConfirm_optname(SecurityUtils.getCurrentNickName());
jo_mst.setConfirm_time(DateUtil.now());
//解锁起点点位、仓位
finish_list.stream()
.map(finish -> finish.getStruct_id())
.distinct()
.forEach(struct_id -> structattrService.update(new UpdateWrapper<StIvtStructattr>().set("inv_code", "").set("lock_type", "0").eq("struct_id", struct_id)));
if (ObjectUtil.isEmpty(collect)) {
checkdtlBcpService.update(new UpdateWrapper<StIvtCheckdtlBcp>().set("status", "99").eq("check_id", form.getString("check_id")));
jo_mst.setStatus(CHECKEnum.BILL_STATUS.code("完成"));
jo_mst.setConfirm_optid(SecurityUtils.getCurrentUserId());
jo_mst.setConfirm_optname(SecurityUtils.getCurrentNickName());
jo_mst.setConfirm_time(DateUtil.now());
//解锁起点点位、仓位
finish_list.stream()
.map(finish -> finish.getStruct_id())
.distinct()
.forEach(struct_id -> structattrService.update(new UpdateWrapper<StIvtStructattr>().set("inv_code", "").set("lock_type", "0").eq("struct_id", struct_id)));
}
}
this.updateById(jo_mst);
}
@@ -296,8 +364,10 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl<StIvtCheckmstBcpMap
throw new BadRequestException("当前仓位的盘点移出任务已经下发!");
}
String point_code = form.getString("point_code");
Map map = new HashMap<>();
map.put("region_code", "A1_BCP_PD");
map.put("region_code", PDAEnum.REGION_CODE.code("半成品盘点区域"));
List<Map> maps = pointMapper.canUsePoint(map);
StIvtCheckmstBcp mst = this.getById(dtl.getCheck_id());
@@ -309,14 +379,14 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl<StIvtCheckmstBcpMap
.acs_task_type("7")
.type(AcsTaskEnum.TASK_STRUCT_CHECK.getCode())
.point_code1(struct.getStruct_code())
.point_code2((String) maps.get(0).get("point_code"))
.point_code2(ObjectUtil.isEmpty(point_code) ? (String) maps.get(0).get("point_code") : point_code)
.vehicle_code(dtl.getStoragevehicle_code())
.task_group_id(task_group_id)
.product_area(mst.getWorkshop_id())
.build();
BussEventMulticaster.Publish(event);
// 下发任务
// 下发任务(String) maps.get(0).get("point_code")
List<SchBaseTask> taskList = taskService.list(
new QueryWrapper<SchBaseTask>().lambda()
.eq(SchBaseTask::getTask_group_id, task_group_id)
@@ -326,7 +396,7 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl<StIvtCheckmstBcpMap
checkdtlBcpService.update(new UpdateWrapper<StIvtCheckdtlBcp>()
.set("is_down", "1")
.set("checkpoint_id", (String) maps.get(0).get("point_code"))
.set("checkpoint_id", ObjectUtil.isEmpty(point_code) ? (String) maps.get(0).get("point_code") : point_code)
.set("status", CHECKEnum.DTL_STATUS.code("盘点中"))
.eq("struct_id", dtl.getStruct_id())
.eq("check_id", dtl.getCheck_id()));
@@ -353,31 +423,60 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl<StIvtCheckmstBcpMap
}
if (dtl.getIs_down().equals("2")) {
checkdtlBcpService.update(new UpdateWrapper<StIvtCheckdtlBcp>()
.set("status", CHECKEnum.DTL_STATUS.code("完成"))
.set("status", CHECKEnum.DTL_STATUS.code("确认完成"))
.eq("struct_id", dtl.getStruct_id())
.eq("check_id", dtl.getCheck_id()));
// 更新起点
iSchBasePointService.update(
new UpdateWrapper<SchBasePoint>().lambda()
.set(SchBasePoint::getVehicle_code, "")
.eq(SchBasePoint::getPoint_code, dtl.getCheckpoint_id())
);
//判断是否存在未完成的明细
List<StIvtCheckdtlBcp> list = checkdtlBcpService.list(new QueryWrapper<StIvtCheckdtlBcp>().eq("check_id", dtl.getCheck_id())
.ne("status", CHECKEnum.DTL_STATUS.code("完成")));
.ne("status", CHECKEnum.DTL_STATUS.code("确认完成")));
if (list.size() == 0) {
StIvtCheckmstBcp jo_mst = this.getOne(new QueryWrapper<StIvtCheckmstBcp>().eq("check_id", dtl.getCheck_id()));
jo_mst.setStatus(CHECKEnum.BILL_STATUS.code("完成"));
jo_mst.setConfirm_optid(SecurityUtils.getCurrentUserId());
jo_mst.setConfirm_optname(SecurityUtils.getCurrentNickName());
jo_mst.setConfirm_time(DateUtil.now());
//解锁起点点位、仓位
this.updateById(jo_mst);
//解锁终点
List<StIvtCheckdtlBcp> finish_list = checkdtlBcpService.list(new QueryWrapper<StIvtCheckdtlBcp>().eq("check_id", dtl.getCheck_id())
.eq("status", CHECKEnum.DTL_STATUS.code("完成")));
.eq("status", CHECKEnum.DTL_STATUS.code("确认完成")));
finish_list.stream()
.map(finish -> finish.getStruct_id())
.map(StIvtCheckdtlBcp::getStruct_id)
.distinct()
.forEach(struct_id -> structattrService.update(new UpdateWrapper<StIvtStructattr>().set("inv_code", "").set("lock_type", "0").eq("struct_id", struct_id)));
}
}
// 更新任务
iSchBaseTaskService.update(
new UpdateWrapper<SchBaseTask>().lambda()
.set(SchBaseTask::getTask_status,TaskStatusEnum.FINISHED.getCode())
.eq(SchBaseTask::getTask_id,task_id )
);
} else if (status.equals(AcsTaskEnum.STATUS_START.getCode())) {
// 更新任务
iSchBaseTaskService.update(
new UpdateWrapper<SchBaseTask>().lambda()
.set(SchBaseTask::getTask_status,TaskStatusEnum.EXECUTING.getCode())
.eq(SchBaseTask::getTask_id,task_id )
);
}
}
@Override
public List<Map> getPdaDtlAll(JSONObject jo) {
return this.baseMapper.getPdaDtlAll(jo);
}
@Override
@Transactional
public void process1(JSONObject whereJson) {
@@ -428,21 +527,36 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl<StIvtCheckmstBcpMap
dtl.setProcess_time(DateUtil.now());
dtl.setProcess_type(CHECKEnum.PROCESS_TYPE.code("实盘为准"));
dtl.setIs_process(true);
// 判断是否已下发，是则生成回去的任务
if (dtl.getIs_down().equals("1")) {
createBackTask(dtl,jo_mst.getWorkshop_id());
dtl.setStatus(CHECKEnum.DTL_STATUS.code("异常处理完成"));
dtl.setIs_down("2");
}
checkdtlBcpService.updateById(dtl);
List<StIvtCheckdtlBcp> finish_list = checkdtlBcpService.list(new QueryWrapper<StIvtCheckdtlBcp>().eq("check_id", form.getString("check_id")).in("status", new String[]{"99", "07"}));
//说明全部确认
if (finish_list.size() == jo_mst.getDtl_num().intValue()) {
checkdtlBcpService.update(new UpdateWrapper<StIvtCheckdtlBcp>().set("status", "99").eq("check_id", form.getString("check_id")));
// 判断是否有任务
List<StIvtCheckdtlBcp> collect = finish_list.stream()
.filter(item -> Integer.parseInt(item.getIs_down()) > 0)
.collect(Collectors.toList());
jo_mst.setStatus(CHECKEnum.BILL_STATUS.code("完成"));
jo_mst.setConfirm_optid(SecurityUtils.getCurrentUserId());
jo_mst.setConfirm_optname(SecurityUtils.getCurrentNickName());
jo_mst.setConfirm_time(DateUtil.now());
//解锁起点点位、仓位
finish_list.stream()
.map(finish -> finish.getStruct_id())
.distinct()
.forEach(struct_id -> structattrService.update(new UpdateWrapper<StIvtStructattr>().set("inv_code", "").set("lock_type", "0").eq("struct_id", struct_id)));
if (ObjectUtil.isEmpty(collect)) {
checkdtlBcpService.update(new UpdateWrapper<StIvtCheckdtlBcp>().set("status", "99").eq("check_id", form.getString("check_id")));
jo_mst.setStatus(CHECKEnum.BILL_STATUS.code("完成"));
jo_mst.setConfirm_optid(SecurityUtils.getCurrentUserId());
jo_mst.setConfirm_optname(SecurityUtils.getCurrentNickName());
jo_mst.setConfirm_time(DateUtil.now());
//解锁起点点位、仓位
finish_list.stream()
.map(finish -> finish.getStruct_id())
.distinct()
.forEach(struct_id -> structattrService.update(new UpdateWrapper<StIvtStructattr>().set("inv_code", "").set("lock_type", "0").eq("struct_id", struct_id)));
}
}
this.updateById(jo_mst);
}

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/IStIvtIostorinvBcpService.java
View File

@@ -50,4 +50,6 @@ public interface IStIvtIostorinvBcpService extends IService<StIvtIostorinvBcp> {
void taskOperate(JSONObject form);
List<Map> getPdaAll(JSONObject form);
}

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/StIvtIostorinvBcpMapper.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.mapper;
import com.alibaba.fastjson.JSONObject;
import org.apache.ibatis.annotations.Param;
import org.nl.common.anno.Datazhuazhua;
import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp;
@@ -20,4 +21,6 @@ import java.util.Map;
@Datazhuazhua
public interface StIvtIostorinvBcpMapper extends BaseMapper<StIvtIostorinvBcp> {
List<Map> getIostorinv(@Param("query") BcpIostorInvQuery query);
List<Map> getPdaAll(JSONObject form);
}

40
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml
View File

@@ -44,4 +44,44 @@
order by dtl.create_time desc
</select>
<select id="getPdaAll" resultType="java.util.Map">
SELECT
dtl.*,
mater.material_code,
mater.material_spec,
dtl.plan_qty / dtl.unit_weight AS qty
FROM
st_ivt_iostorinv_bcp dtl
LEFT JOIN md_me_materialbase mater ON mater.material_id = dtl.material_id
LEFT JOIN sch_base_task task ON task.task_id = dtl.task_id
<where>
dtl.is_delete = false
AND dtl.bill_status != '99'
<if test="io_type != null and io_type != ''">
and dtl.io_type = #{io_type}
</if>
<if test="stor_id != null and stor_id != ''">
and dtl.stor_id = #{stor_id}
</if>
<if test="begin_time != null and begin_time != ''">
and dtl.create_time &lt;= #{begin_time}
</if>
<if test="end_time != null and end_time != ''">
and dtl.create_time &gt;= #{end_time}
</if>
<if test="material_code != null and material_code != ''">
and (mater.material_code LIKE '%${material_code}%' or
mater.material_name LIKE '%${material_code}%')
</if>
<if test="storagevehicle_code != null and storagevehicle_code != ''">
and dtl.storagevehicle_code LIKE '%${storagevehicle_code}%'
</if>
<if test="bill_type != null and bill_type != ''">
and dtl.bill_type = #{bill_type}
</if>
</where>
order by dtl.create_time desc
</select>
</mapper>

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java
View File

@@ -150,6 +150,11 @@ public class StIvtIostorinvBcpOutServiceImpl extends ServiceImpl<StIvtIostorinvB
.eq(StIvtStructattr::getStruct_code, mst.getStruct_code())
.set(StIvtStructattr::getInv_code,mst.getBill_code())
.set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("出库锁")));
// 判断是否自动下发
if (ObjectUtil.isNotEmpty(form.getString("auto_send"))) {
confirmTask(JSONObject.parseObject(JSON.toJSONString(mst)));
}
}
}

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java
View File

@@ -143,6 +143,11 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
.set(MdPbStoragevehicleext::getStorage_qty, mst.getPlan_qty())
.eq(MdPbStoragevehicleext::getStoragevehicle_code, mst.getStoragevehicle_code())
);
// 判断是否自动下发
if (ObjectUtil.isNotEmpty(form.getString("auto_send"))) {
confirmTask(JSONObject.parseObject(JSON.toJSONString(mst)));
}
}
}
@@ -172,7 +177,7 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
new QueryWrapper<MdPbStoragevehicleext>().lambda()
.eq(MdPbStoragevehicleext::getStoragevehicle_code, row.getString("storagevehicle_code"))
);
if (ObjectUtil.isNotEmpty(vehicleDao)) {
if (ObjectUtil.isNotEmpty(vehicleExtDao)) {
vehicleExtDao.setStorage_qty(mst.getPlan_qty());
vehicleExtDao.setMaterial_id(mst.getMaterial_id());
iMdPbStoragevehicleextService.updateById(vehicleExtDao);
@@ -362,6 +367,11 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
}
}
@Override
public List<Map> getPdaAll(JSONObject form) {
return this.baseMapper.getPdaAll(form);
}
private void delTask(String task_id) {
StIvtIostorinvBcp mstDao = this.getOne(

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/IStIvtShutframeinvBcpService.java
View File

@@ -46,5 +46,7 @@ public interface IStIvtShutframeinvBcpService extends IService<StIvtShutframeinv
void confirmOne(JSONObject jo);
List<Map> getPdaAll(JSONObject jo);
}

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/dao/mapper/StIvtShutframeinvBcpMapper.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.storage_manage.semimanage.service.shutFrame.dao.mapper;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.nl.common.domain.query.PageQuery;
@@ -20,4 +21,6 @@ import java.util.Map;
public interface StIvtShutframeinvBcpMapper extends BaseMapper<StIvtShutframeinvBcp> {
List<Map> getMstDetail(@Param("query")ShutQuery query, @Param("pageQuery") PageQuery pageQuery);
List<Map> getPadAll(JSONObject jo);
}

42
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/dao/mapper/xml/StIvtShutframeinvBcpMapper.xml
View File

@@ -35,4 +35,46 @@
</where>
order by mst.create_time DESC
</select>
<select id="getPadAll" resultType="java.util.Map">
SELECT
mst.*,
dtl.turnout_struct_code,
dtl.storagevehicle_code,
dtl.fact_qty,
dtl.turnin_struct_code,
dtl.storagevehicle_code_in,
dtl.qty,
mb.material_code,
mb.material_spec
FROM
st_ivt_shutframeinv_bcp mst
LEFT JOIN st_ivt_shutframedtl_bcp dtl ON dtl.shutframeinv_id = mst.shutframeinv_id
LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
<where>
mst.is_delete = '0'
AND mst.bill_status != '99'
<if test="stor_id != null and stor_id != ''">
and mst.stor_id = #{stor_id}
</if>
<if test="begin_time != null and begin_time != ''">
and mst.create_time &lt;= #{begin_time}
</if>
<if test="end_time != null and end_time != ''">
and mst.create_time &gt;= #{end_time}
</if>
<if test="bill_type != null and bill_type != ''">
and mst.bill_type = #{bill_type}
</if>
<if test="material_code != null and material_code != ''">
and (mb.material_code LIKE '%${material_code}%' or
mb.material_name LIKE '%${material_code}%')
</if>
<if test="storagevehicle_id_in != null and storagevehicle_id_in != ''">
and (dtl.storagevehicle_id_in LIKE '%${storagevehicle_id_in}%' or
dtl.storagevehicle_code LIKE '%${storagevehicle_id_in}%')
</if>
</where>
order by mst.create_time DESC
</select>
</mapper>

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframeinvBcpServiceImpl.java
View File

@@ -291,6 +291,11 @@ public class StIvtShutframeinvBcpServiceImpl extends ServiceImpl<StIvtShutframei
}
@Override
public List<Map> getPdaAll(JSONObject jo) {
return this.baseMapper.getPadAll(jo);
}
@Override
@Transactional
public void issueTask(JSONObject form) {

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/IStIvtStructivtBcpService.java
View File

@@ -37,4 +37,8 @@ public interface IStIvtStructivtBcpService extends IService<StIvtStructivtBcp> {
List<Map> getBcpIvtInfo(JSONObject jo);
Object packageQuery(StructIvtBcpQuery query, PageQuery page);
List<Map> getPdaBcpIvt(JSONObject jo);
List<Map> getPdaBcpMaterialIvt(JSONObject jo);
}

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java
View File

@@ -32,4 +32,7 @@ public interface StIvtStructivtBcpMapper extends BaseMapper<StIvtStructivtBcp> {
List<Map> packageQuery(@Param("query") StructIvtBcpQuery query);
List<Map> getPdaBcpIvt(JSONObject jo);
List<Map> getPdaBcpMaterialIvt(JSONObject jo);
}

67
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml
View File

@@ -169,4 +169,71 @@
order by ivt.instorage_time DESC,attr.struct_code ASC
</select>
<select id="getPdaBcpIvt" resultType="java.util.Map">
SELECT
ivt.*,
mater.material_code,
mater.material_name,
mater.material_spec,
unit.unit_name,
attr.struct_name,
attr.sect_code,
attr.sect_name,
attr.stor_name,
attr.storagevehicle_code
FROM
st_ivt_structivt_bcp ivt
LEFT JOIN md_me_materialbase mater ON ivt.material_id = mater.material_id
LEFT JOIN st_ivt_structattr attr ON attr.struct_id = ivt.struct_id
LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id
<where>
1=1
<if test="material_code!= null and material_code != ''">
and mater.material_code LIKE '%${material_code}%' or
(mater.material_name LIKE '%${material_code}%') or
(mater.material_spec LIKE '%${material_code}%')
</if>
<if test="struct_code!= null and struct_code != ''">
and attr.struct_code LIKE '%${struct_code}%' or
(attr.struct_name LIKE '%${struct_code}%')
</if>
</where>
order by ivt.instorage_time DESC,attr.struct_code ASC
</select>
<select id="getPdaBcpMaterialIvt" resultType="java.util.Map">
SELECT
ivt.*,
mu.unit_name AS qty_unit_name,
mb.material_code,
mb.material_name,
mb.material_spec,
sa.sect_id,
sa.sect_code,
sa.sect_name,
sa.struct_id,
sa.struct_code,
sa.struct_name,
sa.storagevehicle_code
FROM
st_ivt_structivt_bcp ivt
LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt.material_id
LEFT JOIN st_ivt_structattr sa ON sa.struct_id = ivt.struct_id
LEFT JOIN md_pb_measureunit mu ON mu.measure_unit_id = ivt.qty_unit_id
<where>
ivt.canuse_qty > 0
AND
sa.lock_type = '0'
<if test="material_code != null and material_code != ''">
and (mb.material_code LIKE '%${material_code}%' or
mb.material_name LIKE '%${material_code}%')
</if>
<if test="struct_code != null and struct_code != ''">
and (sa.struct_code LIKE '%${struct_code}%' or
sa.struct_name LIKE '%${struct_code}%')
</if>
</where>
</select>
</mapper>

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/impl/StIvtStructivtBcpServiceImpl.java
View File

@@ -51,6 +51,16 @@ public class StIvtStructivtBcpServiceImpl extends ServiceImpl<StIvtStructivtBcpM
return build;
}
@Override
public List<Map> getPdaBcpIvt(JSONObject jo) {
return this.baseMapper.getPdaBcpIvt(jo);
}
@Override
public List<Map> getPdaBcpMaterialIvt(JSONObject jo) {
return this.baseMapper.getPdaBcpMaterialIvt(jo);
}
@Override
public Object getBcpIvt(StructIvtBcpQuery query, PageQuery pageQuery) {
com.github.pagehelper.Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());

5
mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue
View File

@@ -39,7 +39,7 @@
class="filter-item"
>
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
v-for="item in dict.ST_INV_CP_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -253,7 +253,7 @@ export default {
name: 'AddDialog',
components: { MaterDtl, AddDtl },
mixins: [crud(), form(defaultForm)],
dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area', 'PCS_SAL_TYPE'],
dicts: ['IO_BILL_STATUS', 'ST_INV_CP_IN_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area', 'PCS_SAL_TYPE'],
props: {
dialogShow: {
type: Boolean,
@@ -392,6 +392,7 @@ export default {
data.base_bill_type = row.sale_type
data.base_bill_code = row.sale_code
data.base_bill_table = row.seq_no
data.unit_weight = row.unit_weight
data.edit = true
this.form.tableData.splice(-1, 0, data)
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(data.plan_qty)

4
mes/qd/src/views/wms/storage_manage/product/productIn/ViewDialog.vue
View File

@@ -46,7 +46,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
v-for="item in dict.ST_INV_CP_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -163,7 +163,7 @@ export default {
name: 'ViewDialog',
components: { },
mixins: [crud()],
dicts: ['ST_INV_IN_TYPE', 'product_area', 'IO_BILL_STATUS', 'task_status', 'SCH_TASK_TYPE_DTL', 'PCS_SAL_TYPE'],
dicts: ['ST_INV_CP_IN_TYPE', 'product_area', 'IO_BILL_STATUS', 'task_status', 'SCH_TASK_TYPE_DTL', 'PCS_SAL_TYPE'],
props: {
dialogShow: {
type: Boolean,

8
mes/qd/src/views/wms/storage_manage/product/productIn/index.vue
View File

@@ -40,7 +40,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
v-for="item in dict.ST_INV_CP_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -59,7 +59,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
v-for="item in dict.ST_INV_CP_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -257,7 +257,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'product_area'],
dicts: ['IO_BILL_STATUS', 'ST_INV_CP_IN_TYPE', 'product_area'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -344,7 +344,7 @@ export default {
}
},
bill_typeFormat(row, column) {
return this.dict.label.ST_INV_IN_TYPE[row.bill_type]
return this.dict.label.ST_INV_CP_IN_TYPE[row.bill_type]
},
toView(row) {
this.mstrow = row

4
mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue
View File

@@ -39,7 +39,7 @@
class="filter-item"
>
<el-option
v-for="item in dict.ST_INV_OUT_TYPE"
v-for="item in dict.ST_INV_CP_OUT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -235,7 +235,7 @@ export default {
name: 'AddDialog',
components: { MaterDtl, AddDtl, AddIvt },
mixins: [crud(), form(defaultForm)],
dicts: ['IO_BILL_STATUS', 'ST_INV_OUT_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
dicts: ['IO_BILL_STATUS', 'ST_INV_CP_OUT_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
props: {
dialogShow: {
type: Boolean,

4
mes/qd/src/views/wms/storage_manage/product/productOut/ViewDialog.vue
View File

@@ -44,7 +44,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_OUT_TYPE"
v-for="item in dict.ST_INV_CP_OUT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -159,7 +159,7 @@ export default {
name: 'ViewDialog',
components: { },
mixins: [crud()],
dicts: ['ST_INV_OUT_TYPE', 'product_area', 'IO_BILL_STATUS','task_status', 'SCH_TASK_TYPE_DTL', 'PCS_DELIVER_TYPE'],
dicts: ['ST_INV_CP_OUT_TYPE', 'product_area', 'IO_BILL_STATUS','task_status', 'SCH_TASK_TYPE_DTL', 'PCS_DELIVER_TYPE'],
props: {
dialogShow: {
type: Boolean,

6
mes/qd/src/views/wms/storage_manage/product/productOut/index.vue
View File

@@ -84,7 +84,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_OUT_TYPE"
v-for="item in dict.ST_INV_CP_OUT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -230,7 +230,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['IO_BILL_STATUS', 'ST_INV_OUT_TYPE', 'product_area'],
dicts: ['IO_BILL_STATUS', 'ST_INV_CP_OUT_TYPE', 'product_area'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -324,7 +324,7 @@ export default {
return this.dict.label.IO_BILL_STATUS[row.bill_status]
},
bill_typeFormat(row) {
return this.dict.label.ST_INV_OUT_TYPE[row.bill_type]
return this.dict.label.ST_INV_CP_OUT_TYPE[row.bill_type]
},
handleCurrentChange(current) {
if (current === null) {

4
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/AddDialog.vue
View File

@@ -95,7 +95,7 @@
:disabled="crud.status.view > 0"
>
<el-option
v-for="item in dict.ST_INV_OUT_TYPE"
v-for="item in dict.ST_INV_BCP_OUT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -226,7 +226,7 @@ export default {
name: 'AddDialog',
components: { MaterDtl },
mixins: [crud(), form(defaultForm)],
dicts: ['IO_BILL_STATUS', 'ST_QUALITY_SCODE', 'ST_INV_OUT_TYPE', 'product_area'],
dicts: ['IO_BILL_STATUS', 'ST_QUALITY_SCODE', 'ST_INV_BCP_OUT_TYPE', 'product_area'],
cruds() {
return CRUD({ title: '入库新增', crudMethod: { ...crudsemiproductOut }})
},

4
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/ViewDialog.vue
View File

@@ -51,7 +51,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
v-for="item in dict.ST_INV_BCP_OUT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -139,7 +139,7 @@ export default {
name: 'ViewDialog',
components: { },
mixins: [crud()],
dicts: ['ST_INV_IN_TYPE', 'product_area', 'IO_BILL_STATUS', 'task_status'],
dicts: ['ST_INV_BCP_OUT_TYPE', 'product_area', 'IO_BILL_STATUS', 'task_status'],
props: {
dialogShow: {
type: Boolean,

6
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/index.vue
View File

@@ -40,7 +40,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_OUT_TYPE"
v-for="item in dict.ST_INV_BCP_OUT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -219,7 +219,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area', 'ST_INV_OUT_TYPE', 'ST_INV_CREATE'],
dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area', 'ST_INV_BCP_OUT_TYPE', 'ST_INV_CREATE'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -299,7 +299,7 @@ export default {
}
},
bill_typeFormat(row, column) {
return this.dict.label.ST_INV_OUT_TYPE[row.bill_type]
return this.dict.label.ST_INV_BCP_OUT_TYPE[row.bill_type]
},
toView(row) {
this.mstrow = row