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:
zhangzhiqiang
2023-06-09 12:49:19 +08:00
parent 911a61a5e0
commit 32fd5187ad
22 changed files with 112 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
View File

@@ -100,6 +100,15 @@ public class AcsToWmsController {
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/feedDeviceQty2")
@ApiOperation("反馈深坑数量")
@SaIgnore
@Log("反馈深坑数量")
public ResponseEntity<Object> feedDeviceRealQty2(@RequestBody Map param) {
acsToWmsService.feedDevQty(param);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/feedCacheLineBarcodes")
@Log("向wms反馈缓存载具信息")
@ApiOperation("向wms反馈缓存载具信息")

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -41,6 +41,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.math.BigDecimal;
@@ -257,14 +258,17 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
@Override
@Async
public void feedDevQty(Map param) {
WQLObject deviceTab = WQLObject.getWQLObject("pdm_bi_device");
if (CollectionUtils.isEmpty(param)){
return;
}
log.info("反馈设备数量接口:{}", JSONObject.toJSONString(param));
Iterator iterator = param.keySet().iterator();
while (iterator.hasNext()){
String deviceCode = (String)iterator.next();
if (!StringUtils.isEmpty(deviceCode)){
if (deviceCode.contains("SKQX")){
continue;
}
Map item = (Map)param.get(deviceCode);
Object qty = item.get("qty");
Object weight = item.get("weight");

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/AgvBigScreenController.java
View File

@@ -30,14 +30,12 @@ public class AgvBigScreenController {
private final AgvBigScreenService agvBigScreenService;
@PostMapping("/getTask")
@Log("查询任务")
@ApiOperation("查询任务")
public ResponseEntity<Object> getData(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(agvBigScreenService.getTask(whereJson), HttpStatus.OK);
}
@PostMapping("/getAgvMsg")
@Log("查询车辆信息")
@ApiOperation("查询车辆信息")
public ResponseEntity<Object> getAgvMsg(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(agvBigScreenService.getAgvMsg(whereJson), HttpStatus.OK);

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java
View File

@@ -29,20 +29,17 @@ import java.util.Map;
public class BigScreenController {
private final BigScreenService bigScreenService;
@PostMapping("/zk")
@Log("查询中控室监控大屏")
@ApiOperation("查询中控室监控大屏")
public ResponseEntity<Object> getData(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(bigScreenService.getData(whereJson), HttpStatus.OK);
}
@PostMapping("/query3Dcartoon")
@Log("查询三维动画大屏")
@ApiOperation("查询三维动画大屏")
public ResponseEntity<Object> query3Dcartoon(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(bigScreenService.query3Dcartoon(whereJson), HttpStatus.OK);
}
@PostMapping("/workScreen")
@Log("查询工序看板")
@ApiOperation("查询工序看板")
public ResponseEntity<Object> workScreen(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(bigScreenService.workScreen(whereJson), HttpStatus.OK);
@@ -50,14 +47,12 @@ public class BigScreenController {
@GetMapping("/queryInfo")
@Log("查询中控室监控大屏手动设置数据")
@ApiOperation("查询中控室监控大屏手动设置数据")
public ResponseEntity<Object> queryInfo(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(bigScreenService.queryInfo(whereJson,page), HttpStatus.OK);
}
@PostMapping("/add")
@Log("手动添加监控大屏数据")
@ApiOperation("手动添加监控大屏数据")
public ResponseEntity<Object> add(@RequestBody JSONObject param) throws Exception {
bigScreenService.add(param);
@@ -66,7 +61,6 @@ public class BigScreenController {
@PutMapping("/edit")
@Log("手动修改监控大屏数据")
@ApiOperation("手动修改监控大屏数据")
public ResponseEntity<Object> edit(@RequestBody JSONObject param) throws Exception {
bigScreenService.edit(param);
@@ -74,7 +68,6 @@ public class BigScreenController {
}
@DeleteMapping("/del")
@Log("手动删除监控大屏数据")
@ApiOperation("手动删除监控大屏数据")
public ResponseEntity<Object> del(@RequestBody Long[] ids) throws Exception {
bigScreenService.del(ids);

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java
View File

@@ -25,28 +25,24 @@ public class DeviceScreenController {
private final DeviceScreenService deviceScreenService;
@PostMapping("/deviceStatus")
@Log("设备实时状态")
@ApiOperation("设备实时状态")
public ResponseEntity<Object> getData(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(deviceScreenService.deviceStatus(whereJson), HttpStatus.OK);
}
@PostMapping("/oeeAndTeep")
@Log("设备综合效率OEE&产能利用效率TEEP")
@ApiOperation("设备综合效率OEE&产能利用效率TEEP")
public ResponseEntity<Object> oeeAndTeep(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(deviceScreenService.oeeAndTeep(whereJson), HttpStatus.OK);
}
@PostMapping("/queryDeviceByWork")
@Log("运行设备大类产能比")
@ApiOperation("运行设备大类产能比")
public ResponseEntity<Object> queryDeviceByWork(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(deviceScreenService.queryDeviceByWork(whereJson), HttpStatus.OK);
}
@PostMapping("/deviceErrorNum")
@Log("设备TOP10故障次数")
@ApiOperation("设备TOP10故障次数")
public ResponseEntity<Object> deviceErrorNum(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(deviceScreenService.deviceErrorNum(whereJson), HttpStatus.OK);
@@ -60,35 +56,30 @@ public class DeviceScreenController {
}
@PostMapping("/deviceCensus")
@Log("设备综合统计")
@ApiOperation("设备综合统计")
public ResponseEntity<Object> deviceCensus(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(deviceScreenService.deviceCensus(whereJson), HttpStatus.OK);
}
@PostMapping("/deviceErrorInfo")
@Log("设备报警信息")
@ApiOperation("设备报警信息")
public ResponseEntity<Object> deviceErrorInfo(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(deviceScreenService.deviceErrorInfo(whereJson), HttpStatus.OK);
}
@PostMapping("/deviceUseRate")
@Log("设备产能利用")
@ApiOperation("设备产能利用")
public ResponseEntity<Object> deviceUseRate(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(deviceScreenService.deviceUseRate(whereJson), HttpStatus.OK);
}
@PostMapping("/deviceStatusList")
@Log("设备状态列表")
@ApiOperation("设备状态列表")
public ResponseEntity<Object> deviceStatusList(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(deviceScreenService.deviceStatusList(whereJson), HttpStatus.OK);
}
@PostMapping("/errCensus")
@Log("近30天设备故障统计")
@ApiOperation("近30天设备故障统计")
public ResponseEntity<Object> errCensus(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(deviceScreenService.errCensus(whereJson), HttpStatus.OK);

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java
View File

@@ -29,55 +29,47 @@ import java.util.Map;
@RequestMapping("/api/bigscreen/product")
@SaIgnore
@Slf4j
public class ProductController {
public class ProductController<x> {
private final ProductService pdaBindingService;
@PostMapping("/planReached")
@Log("计划达成")
@ApiOperation("计划达成")
public ResponseEntity<Object> planReached(@RequestBody Map<String, String> param) {
return new ResponseEntity<>(pdaBindingService.planReached(param), HttpStatus.OK);
}
@PostMapping("/productSchedule")
@Log("今日排产生产进度跟踪")
@ApiOperation("今日排产生产进度跟踪")
public ResponseEntity<Object> productSchedule(@RequestBody Map<String, String> param) {
return new ResponseEntity<>(pdaBindingService.productSchedule(param), HttpStatus.OK);
}
@PostMapping("/output")
@Log("今日产量")
@ApiOperation("今日产量")
public ResponseEntity<Object> output(@RequestBody Map<String, String> param) {
return new ResponseEntity<>(pdaBindingService.output(param), HttpStatus.OK);
}
@PostMapping("/worksectionHarvest")
@Log("近一周工段产量")
@ApiOperation("近一周工段产量")
public ResponseEntity<Object> worksectionHarvest(@RequestBody Map<String, String> param) {
return new ResponseEntity<>(pdaBindingService.worksectionHarvest(param), HttpStatus.OK);
}
@PostMapping("/topHarvest")
@Log("今日Top10产量")
@ApiOperation("今日Top10产量")
public ResponseEntity<Object> topHarvest(@RequestBody Map<String, String> param) {
return new ResponseEntity<>(pdaBindingService.topHarvest(param), HttpStatus.OK);
}
@PostMapping("/monthHarvest")
@Log("30天产量走势")
@ApiOperation("30天产量走势")
@ApiOperation("30天产量走势")
public ResponseEntity<Object> monthHarvest(@RequestBody Map<String, String> param) {
return new ResponseEntity<>(pdaBindingService.monthHarvest(param), HttpStatus.OK);
}
@PostMapping("/unfinishOrder")
@Log("今日未完成订单")
@ApiOperation("今日未完成订单")
public ResponseEntity<Object> unfinishOrder(@RequestBody Map<String, String> param) {
return new ResponseEntity<>(pdaBindingService.unfinishOrder(param), HttpStatus.OK);
}
@PostMapping("/monthOrder")
@Log("30天生产订单分布")
@ApiOperation("30天生产订单分布")
public ResponseEntity<Object> monthOrder(@RequestBody Map<String, String> param) {
return new ResponseEntity<>(pdaBindingService.monthOrder(param), HttpStatus.OK);

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java
View File

@@ -72,6 +72,7 @@ public class SpecialDeviceController {
iDeviceService.update(new UpdateWrapper<PdmBiDevice>()
.set("material_id",query.getString("material_id"))
.set("deviceinstor_qty",query.getBigDecimal("deviceinstor_qty"))
.set("deviceinstor_weight",query.getBigDecimal("deviceinstor_weight"))
.eq("device_code",device_code));
}
return new ResponseEntity<>(HttpStatus.OK);

14
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java
View File

@@ -146,15 +146,27 @@ public class PdmProduceWorkorderController {
@PostMapping("/reportQuery")
@Log("报工数修改")
@Log("一体机报工数修改")
@ApiOperation("报工数修改")
@SaIgnore
public ResponseEntity<Object> reportQuery(@RequestBody ReportQuery param) {
if (!SecurityUtils.getCurrentUserId().equals("1")){
param.setUser_id(SecurityUtils.getCurrentUserId());
}
return new ResponseEntity<>(TableDataInfo.build(iPdmProduceWorkorderService.reportQuery(param)),HttpStatus.OK);
}
@PostMapping("/reportQuery2")
@Log("报工数修改")
@ApiOperation("报工数修改")
@SaIgnore
public ResponseEntity<Object> reportQuery2(@RequestBody ReportQuery param) {
return new ResponseEntity<>(TableDataInfo.build(iPdmProduceWorkorderService.reportQuery(param)),HttpStatus.OK);
}
}

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java
View File

@@ -77,6 +77,9 @@ public class ProduceshiftorderController{
if(null == param) {
throw new BizCoreException(ResultCode.VALIDATE_FAILED);
}
if (!SecurityUtils.getCurrentUserId().equals("1")){
param.put("optuser",SecurityUtils.getCurrentUserId());
}
List<Map> list = iPdmProduceWorkorderService.getOrderList(param, page);
return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
}
@@ -91,7 +94,9 @@ public class ProduceshiftorderController{
}
/** @see org.nl.common.enums.WorkerOrderEnum */
param.put("workorder_status","'2','3','4'");
param.put("optuser",SecurityUtils.getCurrentUserId());
if (!SecurityUtils.getCurrentUserId().equals("1")){
param.put("optuser",SecurityUtils.getCurrentUserId());
}
List<Map> list = iPdmProduceWorkorderService.getOrderList(param, page);
return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
}

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
View File

@@ -113,6 +113,7 @@ public class SpeEmpTask extends AbstractAcsTask {
"","product_area",one.getProduct_area(),"quantity", param.getString("quantity"),"type",AcsTaskEnum.TASK_CACHELINE_OUT.getCode(),"material_id", one.getMaterial_id()));
String taskId = IdUtil.getStringId();
JSONObject task = packageParam(form, taskId);
task.put("table_fk_id",param.getString("workorder_code"));
taskService.save(task.toJavaObject(SchBaseTask.class));
return taskId;

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java
View File

@@ -108,9 +108,9 @@ public class SpeFullTask extends AbstractAcsTask {
JSONObject form = new JSONObject(MapOf.of("start_point_code",point_code,
"next_point_code","","return_point_code", empPoint.getString("point_code"),"vehicle_code",
"","product_area",order.getProduct_area(),"quantity", quantity,"type",AcsTaskEnum.TASK_PRODUCT_MAC.getCode(),"material_id", order.getMaterial_id()));
String taskId = IdUtil.getStringId();
JSONObject task = packageParam(form, taskId);
task.put("table_fk_id",param.getString("workorder_code"));
taskService.save(task.toJavaObject(SchBaseTask.class));
return taskId;
}

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/wql/QSCH_TASK_01.wql
View File

@@ -52,6 +52,9 @@
PAGEQUERY
SELECT
task.*,
mb.material_name,
mb.material_spec,
mb.material_code,
md.class_name task_type_name,
DICT.label task_status_name,
reg1.region_name as point1_region_name,
@@ -61,6 +64,7 @@
FROM
sch_base_task task
LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
left join md_me_materialbase mb on mb.material_id = task.material_id
LEFT JOIN SYS_DICT DICT ON DICT.`VALUE` = TASK.TASK_STATUS AND DICT.`CODE` = 'TASK_STATUS'
LEFT JOIN SCH_BASE_Region reg1 ON reg1.region_code = (
SELECT p1.region_code FROM SCH_BASE_Point p1 WHERE p1.point_code = task.point_code1

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml
View File

@@ -33,25 +33,23 @@
<if test="material_id != null and material_id != ''">
and (pdm_bi_device.material_id = #{material_id} or pdm_bi_device.material_id is null or pdm_bi_device.material_id = '')
</if>
<if test="spec != null and spec != ''">
and (pdm_bi_device.spec = #{spec} or pdm_bi_device.spec is null)
</if>
GROUP BY pdm_bi_device.device_code
HAVING currentQty > #{qty}
</select>
<select id="workproceduceDevicesWeight" resultType="java.util.Map">
select
GROUP_CONCAT(sch_base_task.task_id) as tasks,GROUP_CONCAT(sch_base_task.material_id) as materials,pdm_bi_device.inupperlimit_qty,pdm_bi_device.deviceinstor_weight,
pdm_bi_device.inupperlimit_qty - ifnull( sum( sch_base_task.material_qty*md_me_materialbase.net_weight), 0 ) - pdm_bi_device.deviceinstor_weight AS currentQty,
GROUP_CONCAT(sch_base_task.task_id) as tasks,GROUP_CONCAT(sch_base_task.material_id) as materials,GROUP_CONCAT(md_me_materialbase.net_weight) as weights,
pdm_bi_device.inupperlimit_qty - ifnull( sum( sch_base_task.material_qty*md_me_materialbase.net_weight ), 0 ) - pdm_bi_device.deviceinstor_qty AS currentQty,
pdm_bi_device.device_code,
sch_base_point.point_code
from sch_base_point
left join pdm_bi_device on pdm_bi_device.device_code = sch_base_point.device_code
left JOIN sch_base_task ON sch_base_point.point_code = point_code2 and '7' > task_status
left join md_me_materialbase on sch_base_task.material_id = md_me_materialbase.material_id
LEFT JOIN md_me_materialbase ON sch_base_task.material_id = md_me_materialbase.material_id
where
sch_base_point.point_type = '4' and pdm_bi_device.is_used = true
AND pdm_bi_device.is_used = true
and workprocedure_id = #{workprocedure_id}
<if test="material_id != null and material_id != ''">
and (pdm_bi_device.material_id = #{material_id} or pdm_bi_device.material_id is null or pdm_bi_device.material_id = '')

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/impl/PdmBiDeviceServiceImpl.java
View File

@@ -12,6 +12,7 @@ import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -45,7 +46,7 @@ public class PdmBiDeviceServiceImpl extends ServiceImpl<PdmBiDeviceMapper, PdmBi
public List<Map> workproceduceDevicesWeight(Map<String, Object> param) {
//#{workprocedure_id} //material_id //#{qty}
MdMeMaterialbase one = iMdMeMaterialbaseService.getOne(new QueryWrapper<MdMeMaterialbase>().eq("material_id", param.get("material_id")));
param.put("qty",one.getNet_weight().doubleValue()*(int)param.get("qty"));
param.put("qty",new BigDecimal(Double.valueOf((String)param.get("qty"))).multiply(one.getNet_weight()));
return this.baseMapper.workproceduceDevicesWeight(param);
}

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/xml/PdmProduceWorkorderrecordMapper.xml
View File

@@ -28,9 +28,15 @@
<if test="query.start_time != null and query.start_time != ''">
and wr.realproducestart_date >= #{query.start_time}
</if>
<if test="query.start_time != null and query.start_time != ''">
and wr.realproducestart_date >= #{query.start_time}
</if>
<if test="query.end_time != null and query.end_time != ''">
and #{query.end_time} >= wr.realproducestart_date
</if>
<if test="query.user_id != null and query.user_id != ''">
and wr.current_produce_person_id = #{query.user_id}
</if>
order by workorder_code desc,seq_number asc
</select>
</mapper>

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java
View File

@@ -22,6 +22,7 @@ public class ReportQuery {
private String report;
private String start_time;
private String end_time;
private String user_id;
private Boolean is_report =false;
private String report_status;

17
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
View File

@@ -69,6 +69,7 @@ import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.function.Predicate;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
@@ -210,7 +211,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("workorder_id", workorder_id);
map.put("type", WorkerOrderEnum.FORCE_COMPLETE.getCode());
map.put("type", WorkerOrderEnum.COMPLETE.getCode());
array.add(map);
Map<String, Object> result = wmsToAcsService.orderStatusUpdate(array);
if (!HttpStatus.OK.equals(result.get("status"))) {
@@ -250,7 +251,8 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
String produce_date = "";
// 循环获取的数据
List<PdmProduceWorkorder> data = new ArrayList<>();
row:
Map<String,String> errorMap = new HashMap();
row:
for (int i = 0; i < read.size(); i++) {
List<Object> list = read.get(i);
if (ObjectUtil.isEmpty(list)) {
@@ -275,7 +277,6 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
workorder.setCreate_name("导入订单");
workorder.setCreate_type(StatusEnum.EXCELINTO.getCode());
Map<String,String> errorMap = new HashMap();
for (int j = 0; j < list.size(); j++) {
String col = String.valueOf(list.get(j));
解析cell:{ //如果是第一行 为生产日期
@@ -302,7 +303,9 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
errorMap.put("第" + i + "行" + col, "物料规格对应物料信息不存在");
error_message = error_message + col + "物料规格对应物料信息不存在，";
} else {
Optional<MdMeMaterialbase> first = material_specs.stream().filter(mdMeMaterialbase -> mdMeMaterialbase.getMaterial_code().contains("S") && !mdMeMaterialbase.getMaterial_code().contains("TH")).findFirst();
Optional<MdMeMaterialbase> first = material_specs.stream().filter(mdMeMaterialbase -> mdMeMaterialbase.getMaterial_code().contains("S")
&& Pattern.matches("^[0-9]*$", mdMeMaterialbase.getMaterial_name().substring(mdMeMaterialbase.getMaterial_name().length() - 1))
).findFirst();
if (!first.isPresent()) {
errorMap.put("第" + i + "行" + col, "物料规格对应物料信息不存在");
}
@@ -452,6 +455,12 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
workorder.setReport_qty(workorder.getReport_qty().add(param.getBigDecimal("report_qty")));
if (workorder.getPlan_qty().doubleValue() <= workorder.getReport_qty().doubleValue()) {
workorder.setWorkorder_status(WorkerOrderEnum.COMPLETE.getCode());
JSONArray array = new JSONArray();
JSONObject map = new JSONObject();
map.put("workorder_id", workorder.getWorkorder_id());
map.put("type", WorkerOrderEnum.COMPLETE.getCode());
array.add(map);
wmsToAcsService.orderStatusUpdate(array);
}
workorder.setReal_qty(null);
this.updateById(workorder);

4
mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml
View File

@@ -24,10 +24,10 @@ spring:
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
username: ${DB_USER:root}
# password: ${DB_PWD:123456}
password: ${DB_PWD:942464Yy}
password: ${DB_PWD:123456}
# 初始连接数
initial-size: 5

28
mes/hd/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -145,6 +145,34 @@ https://juejin.cn/post/6844903775631572999
<appender-ref ref="CONSOLE"/>
</logger>
</springProfile>
<springProfile name="dev3">
<root level="info">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="esLogAppender"/>
</root>
<logger name="jdbc.audit" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="jdbc.resultset" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="springfox.documentation" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="jdbc.resultsettable" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="jdbc.sqlonly" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="jdbc.sqltiming" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="org.jinterop" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
</logger>
</springProfile>
<springProfile name="prod">
<root level="info">
<appender-ref ref="CONSOLE"/>

4
mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue
View File

@@ -64,11 +64,11 @@
</el-table-column>
<el-table-column prop="material_name" label="物料名称" width="200px" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="200px" show-overflow-toolti />
<el-table-column prop="deviceinstor_qty" label="深坑物料数量" align="center" width="120px" show-overflow-tooltip>
<el-table-column prop="deviceinstor_qty" label="物料数量(单位:个)" align="center" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
<el-input v-model="scope.row.deviceinstor_qty" /></template>
</el-table-column>
<el-table-column prop="deviceinstor_weight" label="深坑物料数量" align="center" width="120px" show-overflow-tooltip>
<el-table-column prop="deviceinstor_weight" label="物料重量(单位:g)" align="center" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
<el-input v-model="scope.row.deviceinstor_weight" /></template>
</el-table-column>

2
mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js
View File

@@ -105,7 +105,7 @@ export function getReportWork(data) {
export function reportQuery(data) {
return request({
url: '/api/produceWorkorder/reportQuery',
url: '/api/produceWorkorder/reportQuery2',
method: 'post',
data
})

13
mes/qd/src/views/wms/scheduler_manage/task/index.vue
View File

@@ -109,7 +109,7 @@
<el-select
v-model="task_status"
multiple
style="width: 400px"
style="width: 200px"
placeholder="任务状态"
class="filter-item"
clearable
@@ -129,6 +129,13 @@
</el-form-item>
<rrOperation />
<el-form-item label="未完结任务数">
<el-input
v-model="undo"
clearable
style="width: 180px"
/>
</el-form-item>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -144,13 +151,14 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="50" />
<el-table-column prop="product_area" label="生产车间" />
<el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="table_fk_id" label="业务编码" min-width="100" show-overflow-tooltip />
<el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
<el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
<el-table-column prop = "acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip :formatter = "acsTypeName"></el-table-column>
<el-table-column prop="task_name" label="任务类型" min-width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_status" label="任务状态" />
<el-table-column prop="product_area" label="生产车间" />
<el-table-column prop="task_status_name" label="任务状态" width="120px" :formatter="formatTaskStatusName" />
<el-table-column prop="point_code1" label="起点" width="100" />
<el-table-column prop="point1_region_name" label="起点区域" width="120" />
@@ -273,6 +281,7 @@ export default {
fullscreen: false,
currentComponent: '',
openParam: {},
undo: 0,
create_time: [],
task_status: ['-1'],
taskStatusList: [],