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

fix:物料维护、组盘管理增加产品牌号和物料型号筛选；

Browse Source 
申请贴标增加重量显示；木托盘绑定接口增加砖块数量校验
This commit is contained in:
songxiaopeng
2024-03-14 15:03:07 +08:00
parent 2fc4ea61cb
commit a99c0b7d3f
8 changed files with 121 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java
View File

@@ -519,7 +519,7 @@ public class CockpitServiceImpl implements CockpitService {
//todo 确定每托盘数量
List<InOutKilnVo> res = new ArrayList<>();
InOutKilnVo in = cockPitMapper.selectInKilnInfo();
in.setStat("1");
in.setStat("2");
in.setPointName("入窑输送线");
in.setWorkTime("3.5");
in.setMaterialNum("25000");
@@ -527,7 +527,7 @@ public class CockpitServiceImpl implements CockpitService {
if (null == out) {
out = new InOutKilnVo();
}
out.setStat("1");
out.setStat("2");
out.setPointName("出窑输送线");
out.setWorkTime("3.5");
out.setMaterialNum("25000");

13
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml
View File

@@ -8,7 +8,7 @@
SUM(w.unqualified_qty) AS unqualifiedQty
FROM pdm_bd_workorder w
WHERE w.region_code = 'YZ'
AND DATE ( w.produce_date ) = CURDATE()
AND workorder_status='3'
</select>
<select id="getShiftProductionList" resultType="org.nl.wms.cockpit.service.dao.ShiftProductionVo">
SELECT w.point_name AS columnName,
@@ -17,7 +17,7 @@
SUM(w.plan_qty - w.qualified_qty - w.unqualified_qty) AS lastQty
FROM `pdm_bd_workorder` w
WHERE w.region_code = 'YZ'
AND DATE ( w.produce_date ) = CURDATE()
AND w.workorder_status='3'
GROUP BY
w.point_name
ORDER BY
@@ -36,7 +36,7 @@
FROM pdm_bd_workorder w
LEFT JOIN md_base_material m ON m.material_id = w.material_id
WHERE w.region_code = 'YZ'
AND DATE ( w.produce_date ) = CURDATE()
AND w.workorder_status='3'
GROUP BY
m.order_number
</select>
@@ -128,7 +128,7 @@
FROM pdm_bd_workorder w
LEFT JOIN md_base_material m ON m.material_id = w.material_id
WHERE w.region_code = 'HN'
and DATE ( w.produce_date ) = CURDATE()
AND w.workorder_status='3'
GROUP BY m.material_name
order by m.material_name
</select>
@@ -141,7 +141,7 @@
FROM pdm_bd_workorder w
LEFT JOIN md_base_material m ON w.material_id = m.material_id
WHERE w.region_code = 'YZ'
AND w.produce_date = DATE_FORMAT(CURRENT_DATE (), '%Y%m%d')
AND w.workorder_status='3'
group by m.material_name
order by m.material_name
</select>
@@ -152,7 +152,6 @@
SUM(qualified_qty) AS suppressedNum
FROM pdm_bd_workorder
WHERE region_code = 'YZ'
AND produce_date >= CURDATE() - INTERVAL 7 DAY
GROUP BY
produceDate
ORDER BY
@@ -260,7 +259,7 @@
SELECT r.device_code as deviceCode,
r.error as errorInfo,
r.record_time as errorTime,
p.point_name as deviceName
if(LENGTH(p.point_name) <![CDATA[ > ]]> 0, p.point_name, r.device_code) as deviceName
FROM `das_device_error_record` r
LEFT JOIN sch_base_point p ON r.device_code = p.point_code
ORDER BY r.record_time desc limit 100

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/record/service/dao/mapper/DasDeviceErrorRecordMapper.xml
View File

@@ -3,8 +3,8 @@
<mapper namespace="org.nl.wms.das.device.record.service.dao.mapper.DasDeviceErrorRecordMapper">
<select id="queryErrorVo" resultType="org.nl.wms.cockpit.service.dao.DeviceErrorVo">
select p.point_name as deviceName,
count(*) as errorNum
select if(LENGTH(p.point_name) <![CDATA[ > ]]> 0, p.point_name, r.device_code) as deviceName,
count(*) as errorNum
from das_device_error_record r
left join sch_base_point p on r.device_code = p.point_code
where STR_TO_DATE(r.record_time, '%Y-%m-%d') > NOW() - INTERVAL 30 DAY

18
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -513,13 +513,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
StringBuilder sb = new StringBuilder();
SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getGroupInfo(vehicleCode,
GroupBindMaterialStatusEnum.BOUND.getValue());
// String materialId = groupInfo.getMaterial_id();
// MdBaseMaterial baseMaterial = materialService.getById(materialId);
// BigDecimal materialWeight = ObjectUtil.isNotEmpty(groupInfo.getMaterial_weight())
// ? groupInfo.getMaterial_weight() : BigDecimal.valueOf(0);
// String singleWeightStr = baseMaterial.getSingle_weight();
// BigDecimal singleWeight = BigDecimal.valueOf(Double.parseDouble(singleWeightStr));
// BigDecimal multiply = materialWeight.multiply(singleWeight);
String materialId = groupInfo.getMaterial_id();
MdBaseMaterial baseMaterial = materialService.getById(materialId);
BigDecimal materialWeight = ObjectUtil.isNotEmpty(groupInfo.getMaterial_weight())
? groupInfo.getMaterial_weight() : BigDecimal.valueOf(0);
String singleWeightStr = baseMaterial.getSingle_weight();
BigDecimal singleWeight = BigDecimal.valueOf(Double.parseDouble(singleWeightStr));
BigDecimal multiply = materialWeight.multiply(singleWeight).multiply(BigDecimal.valueOf(1000));
// 获取工单
PdmBdWorkorder workorder = workorderService.selectApplyLabelInfo(groupInfo.getWorkorder_code());
// 组合
@@ -529,6 +529,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
.append(workorder.getMaterial_code()).append("##")
.append(workorder.getMaterial_spec()).append("##")
.append(workorder.getMaterial_model()).append("##")
.append(multiply).append("##")
.append(DateUtil.format(DateUtil.parse(DateUtil.today()), "yyyy/MM/dd"));
return ApplyTaskResponse.responseOk(requestNo, sb.toString());
}
@@ -1006,6 +1007,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
// 砖块数量
Integer qty = param.getInteger("qty");
if (ObjectUtil.isEmpty(qty)){
return BaseResponse.responseError(requestNo, "砖块数量为空！");
}
String vehicleType = workOrder.getVehicle_type();
// 找到相同组盘信息就直接返回id，避免任务取消组盘信息还存在，重复插入
// 解绑同载具的信息

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml
View File

@@ -12,6 +12,12 @@
LEFT JOIN md_base_material ma ON vg.material_id = ma.material_id
LEFT JOIN sch_base_point po ON po.point_code = vg.point_code
WHERE 1 = 1
<if test="query.material_code != null">
AND ma.material_code = #{query.material_code}
</if>
<if test="query.material_model != null">
AND ma.material_model = #{query.material_model}
</if>
<if test="query.vehicle_code != null">
AND vg.vehicle_code = #{query.vehicle_code}
</if>

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java
View File

@@ -16,4 +16,6 @@ public class SchBaseVehiclematerialgroupQuery implements Serializable {
private String workshop_code;
private String region_code;
private String group_bind_material_status;
private String material_code;
private String material_model;
}