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:
zhangzhiqiang
2023-10-19 14:56:30 +08:00
parent 271fb59773
commit 75fc9bddc9
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/src/main/java/org/nl/config/ApiDocScan.java
View File

@@ -3,6 +3,7 @@ package org.nl.config;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.poi.excel.BigExcelWriter; import cn.hutool.poi.excel.BigExcelWriter;
import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelUtil;
import com.alibaba.druid.util.StringUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import org.apache.poi.xssf.streaming.SXSSFSheet; import org.apache.poi.xssf.streaming.SXSSFSheet;
import org.nl.common.anno.Log; import org.nl.common.anno.Log;
@@ -19,6 +20,8 @@ import java.io.File;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.*; import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.function.Predicate;
/* /*
* @author ZZQ * @author ZZQ
@@ -109,7 +112,6 @@ public class ApiDocScan implements SmartLifecycle {
public void stop() { public void stop() {
} }
@Override @Override
public boolean isRunning() { public boolean isRunning() {
return false; return false;

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

@@ -370,6 +370,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
String workorderCode = iterator.next(); String workorderCode = iterator.next();
BigDecimal dq_real_qty = param.getBigDecimal(workorderCode); BigDecimal dq_real_qty = param.getBigDecimal(workorderCode);
PdmProduceWorkorder workorder = map.get(workorderCode); PdmProduceWorkorder workorder = map.get(workorderCode);
if(workorder == null){
continue;
}
BigDecimal subtract = dq_real_qty.subtract(workorder.getDq_real_qty()); BigDecimal subtract = dq_real_qty.subtract(workorder.getDq_real_qty());
if (workorder.getUpdate_time() !=null){ if (workorder.getUpdate_time() !=null){
divide = subtract.divide(new BigDecimal(DateUtil.between(workorder.getUpdate_time(), now, DateUnit.SECOND)), 3, RoundingMode.HALF_UP); divide = subtract.divide(new BigDecimal(DateUtil.between(workorder.getUpdate_time(), now, DateUnit.SECOND)), 3, RoundingMode.HALF_UP);

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

@@ -89,7 +89,7 @@ public class ProduceshiftorderController{
} }
/** @see org.nl.common.enums.WorkerOrderEnum */ /** @see org.nl.common.enums.WorkerOrderEnum */
param.put("workorder_status","'2','3','4'"); param.put("workorder_status","'2','3','4'");
if (!SecurityUtils.getCurrentUserId().equals("1")){ if (!SecurityUtils.getCurrentUsername().equals("admin")){
param.put("optuser",SecurityUtils.getCurrentUserId()); param.put("optuser",SecurityUtils.getCurrentUserId());
} }
List<Map> list = iPdmProduceWorkorderService.getOrderList(param, page); List<Map> list = iPdmProduceWorkorderService.getOrderList(param, page);

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java
View File

@@ -71,10 +71,7 @@ public class PdmProduceWorkorder implements Serializable{
* 物料标识 * 物料标识
*/ */
private String material_id; private String material_id;
/**
* 物料编码
*/
private String material_code;
/** /**
* 物料单重 * 物料单重
*/ */

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

@@ -116,7 +116,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
if(!StringUtils.isEmpty(query.getOrder_status()) && query.getOrder_status().contains("-1")) { if(!StringUtils.isEmpty(query.getOrder_status()) && query.getOrder_status().contains("-1")) {
query.setOrder_status(query.getOrder_status().replaceAll("-1", "1,2,3,4")); query.setOrder_status(query.getOrder_status().replaceAll("-1", "1,2,3,4"));
} }
Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()).setOrderBy("ShiftOrder.planproducestart_date,ShiftOrder.workorder_code desc"); Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()).setOrderBy("ShiftOrder.workorder_code desc");
List<Map> result = pdmProduceWorkorderMapper.pageQuery(query); List<Map> result = pdmProduceWorkorderMapper.pageQuery(query);
TableDataInfo build = TableDataInfo.build(result); TableDataInfo build = TableDataInfo.build(result);
build.setTotalElements(page.getTotal()); build.setTotalElements(page.getTotal());