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

rev:组盘表字段移到点位表

Browse Source
This commit is contained in:
ludj
2024-08-19 08:39:05 +08:00
parent 0dea91b5b3
commit 84a242dcdb
6 changed files with 198 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java
View File

@@ -152,6 +152,19 @@ public class SchBasePoint implements Serializable {
@ApiModelProperty(value = "放货等待点")
private String next_wait_point;
@ApiModelProperty(value = "回温时间(小时)")
private Integer standing_time;
@ApiModelProperty(value = "物料重量")
private BigDecimal material_weight;
@ApiModelProperty(value = "批次")
private String pcsn;
@ApiModelProperty(value = "入库时间")
private String instorage_time;
// @ApiModelProperty(value = "物料名称")
// private String product_description;
//

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java
View File

@@ -216,6 +216,9 @@ public class YCLCKTask extends AbstractTask {
endPointObj.setVehicle_code2(taskObj.getVehicle_code2());
endPointObj.setVehicle_qty(1);
endPointObj.setUpdate_time(DateUtil.now());
endPointObj.setStanding_time(Integer.valueOf(extGroupData.getString("time")));
endPointObj.setPcsn(extGroupData.getString("batch"));
endPointObj.setInstorage_time(DateUtil.now());
pointService.update(endPointObj);
// 起点清空
startPointObj.setVehicle_code("");

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java
View File

@@ -200,6 +200,8 @@ public class YCLRKTask extends AbstractTask {
endPointObj.setVehicle_code2(taskObj.getVehicle_code2());
endPointObj.setUpdate_time(DateUtil.now());
endPointObj.setVehicle_qty(1);
endPointObj.setMaterial_weight(extGroupData.getBigDecimal("weight"));
endPointObj.setInstorage_time(DateUtil.now());
pointService.update(endPointObj);
// 要把数据存到组盘表 -> 改造公共方法，返回id
//组盘表需要关联外部mes晶棒数据，一对多

16
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.xml
View File

@@ -41,10 +41,16 @@
</update>
<select id="queryByMes" resultType="org.nl.wms.mes.domain.QPMES118ResponseBody">
select p.region_code as WhaCode,p.point_code as WhlCode,p.vehicle_code as ParentPalletSN,p.vehicle_code2 as PalletSN,v.material_id as ProductName,v.material_weight as Qty,DATE_FORMAT(v.update_time, '%Y-%m-%d') as WorkDate,v.remark as CustomerName
from sch_base_point p
LEFT JOIN sch_base_vehiclematerialgroup v
on p.vehicle_code2=v.vehicle_code
where p.region_code in('YL','YLHC','HW','HWK');
SELECT
p.region_code AS WhaCode,
p.point_code AS WhlCode,
p.vehicle_code AS ParentPalletSN,
p.vehicle_code2 AS PalletSN,
p.material_weight AS Qty,
DATE_FORMAT( p.update_time, '%Y-%m-%d' ) AS WorkDate
FROM
sch_base_point p
WHERE
p.region_code IN ( 'YL', 'YLHC', 'HW', 'HWK' );
</select>
</mapper>