From dcc9b7294a7f47c00445d2b8dec0097b6b3b0e5e Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 23 十二月 2024 15:45:11 +0800
Subject: [PATCH] Merge branch 'phyzasrs-erp' into phyzasrs-erp-4
---
src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java | 15 -
src/main/resources/mapper/OrderMapper.xml | 4
src/main/webapp/static/js/report/stayTime.js | 23 ++
src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java | 240 +++++++++++++++--------------
src/main/resources/mapper/ViewStayTimeMapper.xml | 40 ++++
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 6
src/main/webapp/views/agvWrkLog/wrkLog.html | 2
src/main/webapp/views/agvWrkMastLog/wrkMastLog.html | 2
src/main/webapp/static/js/agvWrkMast/wrkMast.js | 1
src/main/webapp/static/js/agvWrkLog/wrkLog.js | 1
src/main/webapp/views/report/viewStayTime.html | 40 ++++
src/main/webapp/static/js/orderLog/order.js | 3
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 25 +-
src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js | 2
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 9
src/main/resources/application-loc.yml | 2
src/main/webapp/views/agvWrkMast/wrkMast.html | 2
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 1
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 20 ++
19 files changed, 282 insertions(+), 156 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index 9e69514..35099de 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -89,6 +89,26 @@
if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
bean.setLoc_no(locNo);
}
+ String lev1 = String.valueOf(param.get("lev1"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ bean.setLev1(Integer.parseInt(lev1));
+ }
+ String floor = String.valueOf(param.get("floor"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ bean.setFloor(Integer.parseInt(floor));
+ }
+ String matnr = String.valueOf(param.get("matnr"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ bean.setMatnr(matnr);
+ }
+ String maktx = String.valueOf(param.get("maktx"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ bean.setMaktx(maktx);
+ }
+ String locType1 = String.valueOf(param.get("locType1"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ bean.setMaktx(locType1);
+ }
// List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
// int count = reportQueryMapper.getViewStayTimeCount(bean);
List<ViewStayTimeBean> list = reportQueryMapper.queryAllViewStayTimeList(bean);
diff --git a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
index 6208bb9..ae72b77 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
@@ -19,169 +19,179 @@
@Data
public class ViewStayTimeBean {
- private int pageNumber;
- private int pageSize;
+ private int pageNumber;
+ private int pageSize;
- private int stay_time;
+ private int stay_time;
- private String begin_date;
- private String end_date;
+ private String begin_date;
+ private String end_date;
- private Integer row;
+ private Integer row;
- private Double store_max;
+ private Double store_max;
- private Double store_min;
+ private Double store_min;
- private Integer store_max_date;
+ private Integer store_max_date;
- private Integer sum_qty;
+ private Integer sum_qty;
- @ApiModelProperty(value= "搴撲綅鍙�")
- private String loc_no;
+ @ApiModelProperty(value = "搴撲綅鍙�")
+ private String loc_no;
- @ApiModelProperty(value= "璐ф灦鏉＄爜")
- private String zpallet;
+ @ApiModelProperty(value = "璐ф灦鏉＄爜")
+ private String zpallet;
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
+ @ApiModelProperty(value = "鏁伴噺")
+ private Double anfme;
- @ApiModelProperty(value= "鐗╂枡鍙�")
- private String matnr;
+ @ApiModelProperty(value = "鐗╂枡鍙�")
+ private String matnr;
- @ApiModelProperty(value= "鐗╂枡鍙�")
- private String maktx;
+ private Integer floor;
- @ApiModelProperty(value= "搴忓垪鐮�")
- private String batch;
+ private Integer lev1;
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @TableField("order_no")
- private String orderNo;
+ private Integer locType1;
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
+ @ApiModelProperty(value = "鐗╂枡鍙�")
+ private String maktx;
- @ApiModelProperty(value= "鎵规")
- private String model;
+ @ApiModelProperty(value = "搴忓垪鐮�")
+ private String batch;
- @ApiModelProperty(value= "棰滆壊")
- private String color;
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
+ private String order_no;
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
+ @ApiModelProperty(value = "瑙勬牸")
+ private String specs;
- @ApiModelProperty(value= "sku")
- private String sku;
+ @ApiModelProperty(value = "鎵规")
+ private String model;
- @ApiModelProperty(value= "鍖呮暟")
- private Double units;
+ @ApiModelProperty(value = "棰滆壊")
+ private String color;
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
+ @ApiModelProperty(value = "鍝佺墝")
+ private String brand;
- @ApiModelProperty(value= "鐗╂枡鐘舵��")
- private String origin;
+ @ApiModelProperty(value = "鍗曚綅")
+ private String unit;
- @ApiModelProperty(value= "鍘傚")
- private String manu;
+ @ApiModelProperty(value = "鍗曚环")
+ private Double price;
- @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
- private String manu_date;
+ @ApiModelProperty(value = "sku")
+ private String sku;
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String item_num;
+ @ApiModelProperty(value = "鍖呮暟")
+ private Double units;
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- private Double safe_qty;
+ @ApiModelProperty(value = "鏉＄爜")
+ private String barcode;
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
+ @ApiModelProperty(value = "鐗╂枡鐘舵��")
+ private String origin;
- @ApiModelProperty(value= "闀垮害")
- private Double length;
+ @ApiModelProperty(value = "鍘傚")
+ private String manu;
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
+ @ApiModelProperty(value = "鍗曟嵁鏃堕棿")
+ private String manu_date;
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- private String three_code;
+ @ApiModelProperty(value = "鍝侀」鏁�")
+ private String item_num;
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
+ private Double safe_qty;
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- private String supp_code;
+ @ApiModelProperty(value = "閲嶉噺")
+ private Double weight;
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- private Integer be_batch;
+ @ApiModelProperty(value = "闀垮害")
+ private Double length;
- @ApiModelProperty(value= "淇濊川鏈�")
- private String dead_time;
+ @ApiModelProperty(value = "浣撶Н")
+ private Double volume;
- @ApiModelProperty(value= "棰勮澶╂暟")
- private Integer dead_warn;
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
+ private String three_code;
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
+ @ApiModelProperty(value = "渚涘簲鍟�")
+ private String supp;
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ private String supp_code;
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modi_user;
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ private Integer be_batch;
- @ApiModelProperty(value= "淇敼鏃堕棿")
- private Date modi_time;
+ @ApiModelProperty(value = "淇濊川鏈�")
+ private String dead_time;
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appe_user;
+ @ApiModelProperty(value = "棰勮澶╂暟")
+ private Integer dead_warn;
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- private Date appe_time;
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modi_user);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
- public String getModiTime$(){
- if (Cools.isEmpty(this.modi_time)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modi_time);
- }
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ private Long modi_user;
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appe_user);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ private Date modi_time;
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appe_time)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appe_time);
- }
+ @ApiModelProperty(value = "鍒涘缓鑰�")
+ private Long appe_user;
+
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ private Date appe_time;
+
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
+
+ public String getModiUser$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modi_user);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modi_time)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modi_time);
+ }
+
+ public String getAppeUser$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.appe_user);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appe_time)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appe_time);
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 22628bb..6044ed0 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1041,6 +1041,7 @@
od.setSource(order.getDocType().intValue());
od.setStatus(1);
od.setQty(0.0D);
+ od.setReportQty(0.0D);
od.setCreateBy(9999L);
od.setCreateTime(now);
od.setUpdateBy(9999L);
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index b4caa36..9de9ce6 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -133,13 +133,18 @@
boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
- if (!this.updateSettle2(order.getId(), 4L, pltType, DateUtils.convert(new Date(), DateUtils.yyyyMMdd))) {
+ if (pltType == null) {
+ if (!this.updateSettle(order.getId(), 4L, 9528L)) {
+ throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
+ }
+ } else if (!this.updateSettle2(order.getId(), 4L, pltType, DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F))) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
} else {
if (pltType != null && pltType > 0) {
order.setPltType(pltType);
- super.updateById(order);
+ order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
+ this.baseMapper.updateById(order);
}
//order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 9c764f4..404a5a6 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,6 +1,5 @@
package com.zy.asrs.task;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.AgvLocDetl;
@@ -19,7 +18,6 @@
import org.springframework.stereotype.Component;
import java.util.List;
-import java.util.stream.Collectors;
/**
* Created by vincent on 2020/7/7
@@ -102,7 +100,9 @@
public void completeOrder() {
List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2));
orderList.forEach(order -> {
- orderService.checkComplete(order.getOrderNo(), null);
+ if (order.getPltType() != null) {
+ orderService.checkComplete(order.getOrderNo(), order.getPltType());
+ }
});
}
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 7ff5102..b5ff538 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -136,21 +136,22 @@
Integer pltType = agvWrkMast.getPltType();
- if (Cools.isEmpty(pltType) && !Cools.isEmpty(agvWrkMast.getLocNo())) {
- AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
- if (agvLocMast != null) {
- pltType = agvLocMast.getPltType();
- } else {
- if (!Cools.isEmpty(agvWrkMast.getSourceLocNo())) {
- agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
- if (agvLocMast != null) {
- pltType = agvLocMast.getPltType();
- }
+ if (Cools.isEmpty(pltType)) {
+ AgvLocMast agvLocMast;
+ if (!Cools.isEmpty(agvWrkMast.getLocNo())) {
+ agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
+ if (agvLocMast != null) {
+ pltType = agvLocMast.getPltType();
}
}
- }
- if (Cools.isEmpty(agvWrkMast.getPltType())) {
+ if (!Cools.isEmpty(agvWrkMast.getSourceLocNo())) {
+ agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
+ if (agvLocMast != null) {
+ pltType = agvLocMast.getPltType();
+ }
+ }
agvWrkMast.setPltType(pltType);
+ log.info("浠撳簱缂栫爜锛歿}",agvWrkMast.getPltType());
}
agvWrkMast.setModiTime(new Date());
//淇敼宸ヤ綔妗ｇ姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚
diff --git a/src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java b/src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java
index 58d15b1..1c9e4a1 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java
@@ -77,23 +77,20 @@
break;
}
ReportDataLog reportDataLog = new ReportDataLog();
- String fail = null;
- if (!doHttpRequest(data.getReportJson(), mesTokenInfo, data.getMemo(), url, mesPath, null, "127.0.0.1")) {
- fail = "fail";
- }
+ String result = doHttpRequest(data.getReportJson(), mesTokenInfo, data.getMemo(), url, mesPath, null, "127.0.0.1");
reportDataService.deleteById(data.getId());
BeanUtil.copyProperties(data, reportDataLog);
reportDataLog.setReportTime(new Date());
reportDataLog.setReportDataId(data.getId());
- reportDataLog.setThreeCode(fail);
+ reportDataLog.setThreeCode(result);
reportDataLogService.insert(reportDataLog);
}
return SUCCESS;
}
- private Boolean doHttpRequest(String requestParam, Map<String, Object> headParam, String namespace, String url, String path, String appkey, String ip) {
- String response = "";
+ private String doHttpRequest(String requestParam, Map<String, Object> headParam, String namespace, String url, String path, String appkey, String ip) {
+ String response = "false";
boolean success = false;
try {
@@ -106,7 +103,7 @@
throw new CoolException("mes鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭�:" + jsonObject);
}
success = true;
- return true;
+ return "true";
} catch (Exception e) {
log.error(e.getMessage());
@@ -114,6 +111,6 @@
} finally {
apiLogService.save(namespace, url + path, appkey, ip, requestParam, response, success);
}
- return false;
+ return response;
}
}
diff --git a/src/main/resources/application-loc.yml b/src/main/resources/application-loc.yml
index c9dbc7b..b32a21d 100644
--- a/src/main/resources/application-loc.yml
+++ b/src/main/resources/application-loc.yml
@@ -94,7 +94,7 @@
# url: http://39.184.149.30:8877
# orderReportPath: /DBMS/U8/CM/add
mes:
- report: true
+ report: false
url: https://v3-ali.blacklake.cn/api/openapi/domain/web/v1/route
orderReportPath: /inventory/open/v2/transfer_order/ordinary/_execute
pakinReportPath: /inventory/open/v2/inbound_order/execute/_inbound
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index afb7417..2c8443e 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -64,9 +64,7 @@
update man_order
set settle = #{settle}
,update_time = getdate()
- <if test="plt != null">
- ,plt_type = #{plt}
- </if>
+ ,plt_type = #{plt}
,in_time = #{inTime}
where 1=1
and id = #{orderId}
diff --git a/src/main/resources/mapper/ViewStayTimeMapper.xml b/src/main/resources/mapper/ViewStayTimeMapper.xml
index 7a0e299..a06ccd4 100644
--- a/src/main/resources/mapper/ViewStayTimeMapper.xml
+++ b/src/main/resources/mapper/ViewStayTimeMapper.xml
@@ -42,6 +42,42 @@
</if>
</sql>
+ <sql id="viewStayTimeConditionSql2">
+ <if test="loc_no!=null and loc_no!='' ">
+ and asr_loc_mast.loc_no like '%' + #{loc_no} + '%'
+ </if>
+ <if test="floor!=null and floor!='' ">
+ and floor = #{floor}
+ </if>
+ <if test="locType1!=null and locType1!='' ">
+ and loc_type1 = #{locType1}
+ </if>
+ <if test="lev1!=null and lev1!='' ">
+ and lev1 = #{lev1}
+ </if>
+ <if test="matnr!=null and matnr!='' ">
+ and matnr like '%' + #{matnr} + '%'
+ </if>
+ <if test="stay_time!=null and stay_time!='' ">
+ and stay_time > #{stay_time}
+ </if>
+ <if test="maktx!=null and maktx!='' ">
+ and (maktx like '%' + #{maktx} + '%'
+ )
+ </if>
+ <if test="begin_date!=null and begin_date!='' ">
+ <![CDATA[
+ and appe_time >= #{begin_date}
+ ]]>
+ </if>
+ <if test="end_date!=null and end_date!='' ">
+ <![CDATA[
+ and appe_time <= #{end_date}
+ ]]>
+ </if>
+ </sql>
+
+
<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
<select id="queryViewStayTimeList" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="com.zy.asrs.entity.ViewStayTimeBean">
select
@@ -106,7 +142,7 @@
, all_loc_detl.*
FROM all_loc_detl
where 1=1
- <include refid="viewStayTimeConditionSql"></include>
+ <include refid="viewStayTimeConditionSql2"></include>
) t
left join (select matnr as c ,store_max_date,store_max,store_min from man_mat) b
on t.matnr = b.c
@@ -130,7 +166,7 @@
, all_loc_detl.*
FROM all_loc_detl
where 1=1
- <include refid="viewStayTimeConditionSql"></include>
+ <include refid="viewStayTimeConditionSql2"></include>
) t
) a
</select>
diff --git a/src/main/webapp/static/js/agvWrkLog/wrkLog.js b/src/main/webapp/static/js/agvWrkLog/wrkLog.js
index 3cdd99a..cd92b90 100644
--- a/src/main/webapp/static/js/agvWrkLog/wrkLog.js
+++ b/src/main/webapp/static/js/agvWrkLog/wrkLog.js
@@ -16,6 +16,7 @@
cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
+ ,{field: 'appUser$', align: 'center',title: '鐢ㄦ埛'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿',hide: true}
)
return cols;
diff --git a/src/main/webapp/static/js/agvWrkMast/wrkMast.js b/src/main/webapp/static/js/agvWrkMast/wrkMast.js
index 6887bf7..7145e2f 100644
--- a/src/main/webapp/static/js/agvWrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/agvWrkMast/wrkMast.js
@@ -57,6 +57,7 @@
// ,{field: 'crnStrTime$', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
// ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
// ,{field: 'refIotime$', align: 'center',title: '鎷ｆ枡鏃堕棿'}
+ ,{field: 'appeUser$', align: 'center',title: '鐢ㄦ埛'}
,{field: 'appeTime$', align: 'center',title: '寮�濮嬫椂闂�', hide:false, width: 160}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true, width: 160}
diff --git a/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
index 104dc9c..d7cbf67 100644
--- a/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
@@ -28,7 +28,7 @@
,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+ ,{field: 'appeUser$', align: 'center',title: '鐢ㄦ埛'}
,{field: 'appeTime$', align: 'center',title: '寮�濮嬫椂闂�', hide:false}
,{field: 'barcode', align: 'center',title: '璐ф灦鐮�'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80}
diff --git a/src/main/webapp/static/js/orderLog/order.js b/src/main/webapp/static/js/orderLog/order.js
index c154d9d..93da4c4 100644
--- a/src/main/webapp/static/js/orderLog/order.js
+++ b/src/main/webapp/static/js/orderLog/order.js
@@ -54,8 +54,9 @@
//{field: 'postFee', align: 'center', title: '鎬绘暟閲�', minWidth: 130, width: 130},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', hide: true},
+ {field: 'createBy$', title: '鍒涘缓浜�'},
{field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡'},
- {field: 'shipCode', align: 'center',title: '鍒跺崟浜�', hide: false},
+ //{field: 'shipCode', align: 'center',title: '鍒跺崟浜�', hide: false},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
{field: 'cstmrName', align: 'center',title: '渚涘簲鍟�/瀹㈡埛缂栫爜', hide: true},
diff --git a/src/main/webapp/static/js/report/stayTime.js b/src/main/webapp/static/js/report/stayTime.js
index 7fa12ef..54be399 100644
--- a/src/main/webapp/static/js/report/stayTime.js
+++ b/src/main/webapp/static/js/report/stayTime.js
@@ -4,8 +4,29 @@
{field: 'appeTime$', title: '鍏ュ簱鏃堕棿', align: 'center', width: 200}
,{field: 'stay_time', align: 'center',title: '婊炵暀澶╂暟'}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'zpallet', align: 'center',title: '璐ф灦鏉＄爜', hide: false}
+ // ,{field: 'suppCode', align: 'center',title: '璐ф灦鐮�', hide: false}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'batch', align: 'center',title: '鎵规鑷敱椤�'}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'order_no', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
+ ,{field: 'three_code', align: 'center',title: '閿�鍞鍗曞彿'}
+ ,{field: 'deadTime', align: 'center',title: '閿�鍞鍗曡鍙�' ,hide: true}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸鍨嬪彿', hide: true}
+ ,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿', hide: true}
+ ,{field: 'processSts$', align: 'center',title: '宸ュ簭', hide: true}
+
+ ,{field: 'brand', align: 'center',title: '鍟嗗搧鍒嗙被缂栫爜', hide: true}
+ ,{field: 'color', align: 'center',title: '鍟嗗搧鍒嗙被鍚嶇О', hide: true}
+ ,{field: 'unit', align: 'center',title: '璁￠噺鍗曚綅', hide: true}
+ ,{field: 'price', align: 'center',title: '杩涢」绋�', hide: true}
+ ,{field: 'units', align: 'center',title: '閿�椤圭◣', hide: true}
+ ,{field: 'dsDate', align: 'center',title: '鍚敤鏃ユ湡', hide: true}
+ ,{field: 'supp', align: 'center',title: '寤烘。浜�', hide: true}
+ ,{field: 'dInvCreateDatetime', align: 'center',title: '寤烘。鏃ユ湡', hide: true}
];
- cols.push.apply(cols, detlCols);
+ //cols.push.apply(cols, detlCols);
return cols;
}
diff --git a/src/main/webapp/views/agvWrkLog/wrkLog.html b/src/main/webapp/views/agvWrkLog/wrkLog.html
index f6cb61e..5249e8b 100644
--- a/src/main/webapp/views/agvWrkLog/wrkLog.html
+++ b/src/main/webapp/views/agvWrkLog/wrkLog.html
@@ -92,7 +92,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/agvWrkLog/wrkLog.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/agvWrkLog/wrkLog.js?v=1" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
diff --git a/src/main/webapp/views/agvWrkMast/wrkMast.html b/src/main/webapp/views/agvWrkMast/wrkMast.html
index c384e56..94bbca3 100644
--- a/src/main/webapp/views/agvWrkMast/wrkMast.html
+++ b/src/main/webapp/views/agvWrkMast/wrkMast.html
@@ -144,7 +144,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/agvWrkMast/wrkMast.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/agvWrkMast/wrkMast.js?v=2" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
diff --git a/src/main/webapp/views/agvWrkMastLog/wrkMastLog.html b/src/main/webapp/views/agvWrkMastLog/wrkMastLog.html
index 8a9445e..5c66fc3 100644
--- a/src/main/webapp/views/agvWrkMastLog/wrkMastLog.html
+++ b/src/main/webapp/views/agvWrkMastLog/wrkMastLog.html
@@ -89,7 +89,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/agvWrkMastLog/wrkMastLog.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/agvWrkMastLog/wrkMastLog.js?v=1" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
diff --git a/src/main/webapp/views/report/viewStayTime.html b/src/main/webapp/views/report/viewStayTime.html
index 6269cce..cc288a2 100644
--- a/src/main/webapp/views/report/viewStayTime.html
+++ b/src/main/webapp/views/report/viewStayTime.html
@@ -24,10 +24,44 @@
<input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡缂栧彿" autocomplete="off">
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鍚嶇О" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="locType1" class="layui-input" type="text" style="display: none" name="loc_type1">
+ <input id="locType1$" placeholder="搴撲綅绫诲瀷" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basLocType1QueryBylocType1" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basLocType1QueryBylocType1Select" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="lev1" placeholder="灞�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="floor" placeholder="妤�" autocomplete="off">
+ </div>
+ </div>
+
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
- <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储
+ </button>
</div>
</div>
@@ -35,7 +69,7 @@
<table class="layui-hide" id="stayTime" lay-filter="stayTime"></table>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" >瀵煎嚭</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
</div>
</script>
@@ -46,7 +80,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/report/stayTime.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/report/stayTime.js?v=2" charset="utf-8"></script>
</body>
</html>
--
Gitblit v1.9.1