From 23d98e719feeba8440522a4474c473cabc10d832 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期一, 29 七月 2024 10:42:57 +0800
Subject: [PATCH] 代码bug修改调试
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 7 +
src/main/resources/mapper/WrkDetlLogMapper.xml | 13 +++
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2
src/main/java/com/zy/asrs/entity/OrderDetl.java | 2
src/main/java/com/zy/asrs/service/LocDetlService.java | 2
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 1
src/main/resources/mapper/LocDetlMapper.xml | 19 ++++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 26 ++++--
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 8 +
src/main/java/com/zy/common/model/LocDto.java | 5 +
src/main/java/com/zy/third/lk/task/LKInTBScheduler.java | 38 ++++++---
src/main/resources/mapper/OrderDetlMapper.xml | 12 +++
src/main/webapp/static/js/locDetl/locDetl.js | 2
src/main/resources/mapper/WrkDetlMapper.xml | 15 +++
src/main/java/com/zy/asrs/entity/LocDetl.java | 10 ++
src/main/java/com/zy/asrs/entity/StockStatisDTO.java | 1
src/main/webapp/static/js/order/out.js | 5 +
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2
src/main/java/com/zy/asrs/entity/WrkDetl.java | 7 +
src/main/webapp/static/js/order/order.js | 7 +
src/main/java/com/zy/third/erp/task/ERPInOrOutService.java | 8 +
src/main/webapp/static/js/common.js | 9 +-
src/main/java/com/zy/asrs/controller/OutController.java | 36 +++------
src/main/resources/application.yml | 1
24 files changed, 171 insertions(+), 67 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 23fb3a9..671d359 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -57,31 +57,17 @@
return R.parse(BaseRes.PARAM);
}
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
+ //鐢ㄦ埛纭鍑哄叆搴撻兘浠gno涓哄噯锛岄偅涔堜笉鑰冭檻鏁伴噺浜�
List<LocDto> locDtos = new ArrayList<>();
-
- Set<String> exist = new HashSet<>();
-
- for (OrderDetl orderDetl : orderDetls) {
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
+ if (orderDetls != null && !orderDetls.isEmpty()) {
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetls.get(0).getSPgNO());
for (LocDetl locDetl : locDetls) {
- if (issued > 0) {
- LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
- issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
- List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
- locDto.setStaNos(staNos);
- locDtos.add(locDto);
- exist.add(locDetl.getLocNo());
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
- } else {
- break;
- }
- }
- if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
- locDto.setLack(Boolean.TRUE);
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetls.get(0).getOrderNo(),
+ locDetl.getAnfme());
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), 101);
+ locDto.setStaNos(staNos);
+ locDto.setZpallet(locDetl.getZpallet());
+ locDto.setSPgNO(orderDetls.get(0).getSPgNO());
locDtos.add(locDto);
}
}
@@ -110,7 +96,9 @@
List<TaskDto> taskDtos = new ArrayList<>();
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
for (LocDto locDto : locDtos) {
- if (locDto.isLack()) { continue; }
+ if (locDto.isLack()) {
+ continue;
+ }
TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
if (TaskDto.has(taskDtos, taskDto)) {
TaskDto dto = TaskDto.find(taskDtos, taskDto);
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 73febfb..173e54a 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -158,7 +158,8 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
-
+ @TableField("pro_type")
+ private String proType;
/**
* 璁㈠崟鍙�
*/
@@ -186,6 +187,13 @@
private String temp3;
+ @TableField("i_no")
+ private Integer iNo;
+
+ @TableField("packing")
+ private String packing;
+
+
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 029c03b..4616743 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -296,7 +296,7 @@
private String memo;
@TableField("i_no")
- private Integer iNO;
+ private Integer iNo;
/**
* 澶栭儴涓婚敭
diff --git a/src/main/java/com/zy/asrs/entity/StockStatisDTO.java b/src/main/java/com/zy/asrs/entity/StockStatisDTO.java
index ff3381e..39b8b45 100644
--- a/src/main/java/com/zy/asrs/entity/StockStatisDTO.java
+++ b/src/main/java/com/zy/asrs/entity/StockStatisDTO.java
@@ -17,4 +17,5 @@
private String pgNo;
private String outOrderNo;
private String batch;
+ private String model;
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 939004d..da1e097 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -269,6 +269,8 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @TableField("pro_type")
+ private String proType;
/**
* 璁㈠崟鍙�
*/
@@ -295,6 +297,11 @@
private String temp3;
+ @TableField("i_no")
+ private Integer iNo;
+
+ @TableField("packing")
+ private String packing;
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 3ae409b..1060afc 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -268,6 +268,8 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @TableField("pro_type")
+ private String proType;
/**
* 璁㈠崟鍙�
*/
@@ -294,6 +296,11 @@
private String temp3;
+ @TableField("i_no")
+ private Integer iNo;
+
+ @TableField("packing")
+ private String packing;
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 43f37e5..91f71db 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -57,7 +57,7 @@
// -------------------------------------------------
- List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos);
+ List<LocDetl> queryStock(@Param("sPgNO")String sPgNO, @Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos);
Double queryStockAnfme(String matnr, String batch);
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 4665c70..8bb36d3 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -54,6 +54,8 @@
List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos);
+ List<LocDetl> queryStock(String sPgNO);
+
Double queryStockAnfme(String matnr, String batch);
List<StockVo> queryStockTotal();
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 2698d7b..ff7f8a8 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -52,8 +52,8 @@
}
@Override
- public List<String> getSameDetlToday(String matnr,String batch, Integer start, Integer end) {
- return this.baseMapper.selectSameDetlTodayBatch(matnr,batch, start, end);
+ public List<String> getSameDetlToday(String matnr, String batch, Integer start, Integer end) {
+ return this.baseMapper.selectSameDetlTodayBatch(matnr, batch, start, end);
}
@@ -86,7 +86,12 @@
@Override
public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
- return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
+ return this.baseMapper.queryStock(null, matnr, batch, orderNo, locNos);
+ }
+
+ @Override
+ public List<LocDetl> queryStock(String spgNo) {
+ return this.baseMapper.queryStock(spgNo, null, null, null, null);
}
@Override
@@ -101,6 +106,7 @@
/**
* 鑾峰彇搴撳瓨鎬绘暟
+ *
* @return
*/
@Override
@@ -126,23 +132,23 @@
}
@Override
- public void updateMatTurn(String matnrOld,String matnr){
- this.baseMapper.updateMatTurn(matnrOld,matnr);
+ public void updateMatTurn(String matnrOld, String matnr) {
+ this.baseMapper.updateMatTurn(matnrOld, matnr);
}
@Override
public List<Map<String, Object>> selectLocDetlUnilateralMoveShuttleMap(Integer crnNo) {
- if (crnNo==1){
+ if (crnNo == 1) {
return this.baseMapper.selectLocDetlUnilateralMoveShuttleMapY(crnNo);
}
return this.baseMapper.selectLocDetlUnilateralMoveShuttleMapN(crnNo);
}
@Override
- public List<LocDetl> selectLocDetlUnilateralMoveShuttle(String matnr,String batch,String grade,Integer crnNo) {
- if (crnNo==1){
- return this.baseMapper.selectLocDetlUnilateralMoveShuttleY(matnr,batch,grade);
+ public List<LocDetl> selectLocDetlUnilateralMoveShuttle(String matnr, String batch, String grade, Integer crnNo) {
+ if (crnNo == 1) {
+ return this.baseMapper.selectLocDetlUnilateralMoveShuttleY(matnr, batch, grade);
}
- return this.baseMapper.selectLocDetlUnilateralMoveShuttleN(matnr,batch,grade);
+ return this.baseMapper.selectLocDetlUnilateralMoveShuttleN(matnr, batch, grade);
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index f31fec3..4ea5c76 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -335,7 +335,7 @@
wrkDetl.setZpallet(wrkMast.getBarcode());
wrkDetl.setIoTime(now);
wrkDetl.setWrkNo(workNo);
- wrkDetl.setBatch(locDto.getBatch());
+ //wrkDetl.setBatch(locDto.getBatch());
wrkDetl.setOrderNo(locDto.getOrderNo());
wrkDetl.setAnfme(locDto.getAnfme()); // 鏁伴噺
wrkDetl.setAppeTime(now);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index d71d3e4..a0dfd48 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
@@ -14,6 +15,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import java.util.Date;
import java.util.Iterator;
import java.util.List;
@@ -42,6 +44,7 @@
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
try {
+ System.out.println(DateUtils.convert(new Date()));
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
// 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
if (!Cools.isEmpty(wrkDetls)) {
@@ -54,7 +57,7 @@
}
}
}
-
+ System.out.println(DateUtils.convert(new Date()));
// 鍏ュ簱 --------------------------------------------------------------------------------
if (wrkMast.getWrkSts() == 5) {
// 鍏ㄦ澘鍏ュ簱
@@ -93,7 +96,7 @@
// }
// }
}
-
+ System.out.println(DateUtils.convert(new Date()));
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
@@ -110,6 +113,7 @@
if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
+ System.out.println(DateUtils.convert(new Date()));
} catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index ca099a3..767c372 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -29,6 +29,11 @@
private Integer staNo;
+ private String sPgNO;
+
+ private String zpallet;
+
+
public LocDto() {
}
diff --git a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
index c9543c7..aff3acf 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
@@ -67,7 +67,7 @@
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
inHedTB.getBillNo(), // 璁㈠崟缂栧彿
- DateUtils.convert(inHedTB.getBillDate()), // 鍗曟嵁鏃ユ湡
+ DateUtils.convert(inHedTB.getMakeDate()), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
null, //
@@ -125,7 +125,7 @@
orderDetl.setWareName(outDetTB.getWareName());
orderDetl.setBatch(outDetTB.getItemBatch());
orderDetl.setAnfme(outDetTB.getMainNum());
- orderDetl.setINO(outDetTB.getINO());
+ orderDetl.setINo(outDetTB.getINO());
orderDetl.setOrderId(order.getId());
orderDetl.setTemp1(outDetTB.getTemp1());
orderDetl.setTemp2(outDetTB.getTemp2());
@@ -139,6 +139,7 @@
orderDetl.setStatus(1);
orderDetl.setProType(outDetTB.getProtype());
orderDetl.setQty(0.0D);
+ orderDetl.setSPgNO(outDetTB.getSPgNO());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -225,7 +226,7 @@
orderDetl.setWareName(outDetTB.getWareName());
orderDetl.setBatch(outDetTB.getItemBatch());
orderDetl.setAnfme(outDetTB.getMainNum());
- orderDetl.setINO(outDetTB.getINO());
+ orderDetl.setINo(outDetTB.getINO());
orderDetl.setOrderId(order.getId());
orderDetl.setTemp1(outDetTB.getTemp1());
orderDetl.setTemp2(outDetTB.getTemp2());
@@ -239,6 +240,7 @@
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
orderDetl.setProType(outDetTB.getProType());
+ orderDetl.setSPgNO(outDetTB.getSPgNO());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
diff --git a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
index 41e56ed..5eb0b41 100644
--- a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
+++ b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Mat;
@@ -19,6 +20,7 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -63,12 +65,14 @@
if (docType.getPakin() == 1) {
//鍏ュ簱鍗�
for (OrderDetl orderDetl : orderDetls) {
+ log.info("璇ュ叆搴撳崟瀵硅薄:" + orderDetl);
insertInDet(orderDetl);
}
insertInHed(order);
} else {
//鍑哄簱鍗�
for (OrderDetl orderDetl : orderDetls) {
+ log.info("璇ュ嚭搴撳崟瀵硅薄:" + orderDetl);
insertOutDet(orderDetl);
}
insertOutHed(order);
@@ -99,7 +103,6 @@
log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄨ韩宸插瓨鍦�:" + orderDetl.getOrderNo() + "==>>" + orderDetl.getOrderNo());
return true;
}
- Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
Map<String, Object> content = getMap(orderDetl);
int insert = erpSqlServer.insert(InDetTB.class, content);
@@ -129,17 +132,23 @@
log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄥご宸插瓨鍦�:" + order.getOrderNo());
return true;
}
+ DocType docType = docTypeService.selectById(order.getDocType());
HashMap<String, Object> content = new HashMap<>();
content.put("BillNo", "'" + order.getOrderNo() + "'");
- content.put("IoKindID", "'" + order.getDocType() + "'");
+ content.put("BillDate", "'" + DateUtils.convert(new Date()) + "'");
+ if (!Cools.isEmpty(docType.getDocCode())) content.put("IoKindID", "'" + docType.getDocCode() + "'");
+ if (!Cools.isEmpty(docType.getDocName())) content.put("IoKindName", "'" + docType.getDocName() + "'");
+ if (!Cools.isEmpty(order.getWareId())) content.put("wareId", "'" + order.getWareId() + "'");
+ if (!Cools.isEmpty(order.getWareName())) content.put("wareName", "'" + order.getWareName() + "'");
+ if (!Cools.isEmpty(order.getTemp1())) content.put("temp1", "'" + order.getTemp1() + "'");
+ if (!Cools.isEmpty(order.getTemp2())) content.put("temp2", "'" + order.getTemp2() + "'");
+ if (!Cools.isEmpty(order.getTemp3())) content.put("temp3", "'" + order.getTemp3() + "'");
if (!Cools.isEmpty(order.getCstmr())) content.put("ObjectId", "'" + order.getCstmr() + "'");
if (!Cools.isEmpty(order.getCstmrName())) content.put("ObjectName", "'" + order.getCstmrName() + "'");
if (!Cools.isEmpty(order.getMemo())) content.put("Remark", "'" + order.getMemo() + "'");
content.put("LKName", "'涓壃浜屾湡'");
content.put("bPass", "1");
int insert = erpSqlServer.insert(InHedTB.class, content);
- //String sql = "UPDATE lk_InHedTB SET bPass = 1, LKName='涓壃浜屾湡' WHERE BillNo = '" + order.getOrderNo() + "'";
- //int update = erpSqlServer.update(sql);
if (insert == 1) {
log.info("鍏ュ簱鍗曡〃澶村洖浼犳垚鍔�:" + content);
return true;
@@ -167,9 +176,8 @@
log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄨ韩宸插瓨鍦�:" + orderDetl.getOrderNo() + "==>>" + orderDetl.getOrderNo());
return true;
}
- Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
Map<String, Object> content = getMap(orderDetl);
- int insert = erpSqlServer.insert(InDetTB.class, content);
+ int insert = erpSqlServer.insert(OutDetTB.class, content);
if (insert == 1) {
log.info("鍏ュ簱鍗曡〃韬洖浼犳垚鍔�:" + content.toString());
@@ -197,17 +205,23 @@
log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄥご宸插瓨鍦�:" + order.getOrderNo());
return true;
}
+ DocType docType = docTypeService.selectById(order.getDocType());
HashMap<String, Object> content = new HashMap<>();
content.put("BillNo", "'" + order.getOrderNo() + "'");
- content.put("IoKindID", "'" + order.getDocType() + "'");
+ content.put("BillDate", "'" + DateUtils.convert(new Date()) + "'");
+ if (!Cools.isEmpty(docType.getDocCode())) content.put("IoKindID", "'" + docType.getDocCode() + "'");
+ if (!Cools.isEmpty(docType.getDocName())) content.put("IoKindName", "'" + docType.getDocName() + "'");
+ if (!Cools.isEmpty(order.getWareId())) content.put("wareId", "'" + order.getWareId() + "'");
+ if (!Cools.isEmpty(order.getWareName())) content.put("wareName", "'" + order.getWareName() + "'");
+ if (!Cools.isEmpty(order.getTemp1())) content.put("temp1", "'" + order.getTemp1() + "'");
+ if (!Cools.isEmpty(order.getTemp2())) content.put("temp2", "'" + order.getTemp2() + "'");
+ if (!Cools.isEmpty(order.getTemp3())) content.put("temp3", "'" + order.getTemp3() + "'");
if (!Cools.isEmpty(order.getCstmr())) content.put("ObjectId", "'" + order.getCstmr() + "'");
if (!Cools.isEmpty(order.getCstmrName())) content.put("ObjectName", "'" + order.getCstmrName() + "'");
if (!Cools.isEmpty(order.getMemo())) content.put("Remark", "'" + order.getMemo() + "'");
content.put("LKName", "'涓壃浜屾湡'");
content.put("bPass", "1");
int insert = erpSqlServer.insert(OutHedTB.class, content);
- //String sql = "UPDATE lk_OutHedTB SET bPass = 1, LKName='涓壃浜屾湡' WHERE BillNo = '" + order.getOrderNo() + "'";
- //int update = erpSqlServer.update(sql);
if (insert == 1) {
log.info("鍏ュ簱鍗曡〃澶村洖浼犳垚鍔�:" + content);
return true;
@@ -220,10 +234,10 @@
private Map<String, Object> getMap(OrderDetl orderDetl) {
Map<String, Object> content = new HashMap<>();
if (!Cools.isEmpty(orderDetl.getOrderNo())) content.put("BillNo", "'" + orderDetl.getOrderNo() + "'");
- if (!Cools.isEmpty(orderDetl.getINO())) content.put("iNO", "'" + orderDetl.getINO() + "'");
+ if (!Cools.isEmpty(orderDetl.getINo())) content.put("iNo", "'" + orderDetl.getINo() + "'");
if (!Cools.isEmpty(orderDetl.getThreeCode())) content.put("detId", orderDetl.getThreeCode());
- if (!Cools.isEmpty(orderDetl.getThreeCode())) content.put("ItemId", "'" + orderDetl.getThreeCode() + "'");
- if (!Cools.isEmpty(orderDetl.getMatnr())) content.put("ItemCode", "'" + orderDetl.getMatnr() + "'");
+ if (!Cools.isEmpty(orderDetl.getMatnr())) content.put("ItemId", "'" + orderDetl.getMatnr() + "'");
+ if (!Cools.isEmpty(orderDetl.getModel())) content.put("ItemCode", "'" + orderDetl.getModel() + "'");
if (!Cools.isEmpty(orderDetl.getBatch())) content.put("ItemBatch", "'" + orderDetl.getBatch() + "'");
if (!Cools.isEmpty(orderDetl.getProType())) content.put("proType", "'" + orderDetl.getProType() + "'");
if (!Cools.isEmpty(orderDetl.getMemo())) content.put("remark", "'" + orderDetl.getMemo() + "'");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5f91455..25f0b29 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -28,6 +28,7 @@
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
+
logging:
path: /stock/out/@pom.build.finalName@/logs
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 79d0924..f99797f 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -44,6 +44,20 @@
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
<result column="memo" property="memo" />
+
+
+ <result column="i_no" property="iNo" />
+ <result column="temp1" property="temp1" />
+ <result column="temp2" property="temp2" />
+ <result column="temp3" property="temp3" />
+ <result column="pg_no" property="sPgNO" />
+ <result column="pro_type" property="proType" />
+ <result column="auto_id" property="autoId" />
+ <result column="out_order_no" property="outOrderNo" />
+ <result column="lu_hao" property="luHao" />
+ <result column="ware_id" property="wareId" />
+ <result column="ware_mame" property="wareName" />
+ <result column="packing" property="packing" />
</resultMap>
<sql id="batchSeq">
@@ -218,7 +232,7 @@
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
and b.loc_sts = 'F'
- and a.matnr = #{matnr}
+
<!-- <choose>-->
<!-- <when test="batch != null and batch != ''">-->
<!-- and a.batch = #{batch}-->
@@ -227,6 +241,7 @@
<!-- and (a.batch IS NULL OR a.batch = '')-->
<!-- </otherwise>-->
<!-- </choose>-->
+ and a.pg_no = #{sPgNO}
<if test="batch != null and batch != ''">
and a.batch = #{batch}
</if>
@@ -426,7 +441,7 @@
<id column="pgNo" property="pgNo" />
<id column="outOrderNo" property="outOrderNo" />
<id column="batch" property="batch" />
-
+ <id column="model" property="model" />
</resultMap>
<select id="asrsAndErpList" resultMap="stockStatisDTO">
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index ce8f4fa..b5870e9 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -46,6 +46,18 @@
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
+ <result column="i_no" property="iNo" />
+ <result column="temp1" property="temp1" />
+ <result column="temp2" property="temp2" />
+ <result column="temp3" property="temp3" />
+ <result column="pg_no" property="sPgNO" />
+ <result column="pro_type" property="proType" />
+ <result column="auto_id" property="autoId" />
+ <result column="out_order_no" property="outOrderNo" />
+ <result column="lu_hao" property="luHao" />
+ <result column="ware_id" property="wareId" />
+ <result column="ware_mame" property="wareName" />
+ <result column="packing" property="packing" />
</resultMap>
<select id="selectItem" resultMap="BaseResultMap">
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index bef4275..27654cd 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -45,6 +45,19 @@
<result column="appe_user" property="appeUser"/>
<result column="appe_time" property="appeTime"/>
<result column="memo" property="memo"/>
+
+ <result column="i_no" property="iNo" />
+ <result column="temp1" property="temp1" />
+ <result column="temp2" property="temp2" />
+ <result column="temp3" property="temp3" />
+ <result column="pg_no" property="sPgNO" />
+ <result column="pro_type" property="proType" />
+ <result column="auto_id" property="autoId" />
+ <result column="out_order_no" property="outOrderNo" />
+ <result column="lu_hao" property="luHao" />
+ <result column="ware_id" property="wareId" />
+ <result column="ware_mame" property="wareName" />
+ <result column="packing" property="packing" />
</resultMap>
<sql id="batchSeq">
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index c8c7903..0de341d 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -45,6 +45,21 @@
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
<result column="memo" property="memo" />
+
+
+ <result column="i_no" property="iNo" />
+ <result column="temp1" property="temp1" />
+ <result column="temp2" property="temp2" />
+ <result column="temp3" property="temp3" />
+ <result column="pg_no" property="sPgNO" />
+ <result column="pro_type" property="proType" />
+ <result column="auto_id" property="autoId" />
+ <result column="out_order_no" property="outOrderNo" />
+ <result column="lu_hao" property="luHao" />
+ <result column="ware_id" property="wareId" />
+ <result column="ware_mame" property="wareName" />
+ <result column="packing" property="packing" />
+
</resultMap>
<sql id="batchSeq">
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 4d71a14..46ea422 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -188,7 +188,7 @@
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', width: 200}
// ,{field: 'name', align: 'center',title: '鍒悕'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
+ ,{field: 'model', align: 'center',title: '浠ｇ爜'}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
@@ -223,17 +223,16 @@
var detlCols = [
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿锛堝搧鍙凤級', sort:true}
+ ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'batch', align: 'center',title: '璐у搧鐗瑰緛', sort:true}
+ ,{field: 'batch', align: 'center',title: '鎵规', sort:true}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
-
,{field: 'specs', align: 'center',title: '瑙勬牸', hide: false}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 1beb9e2..959a33d 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -4,13 +4,13 @@
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
,{field: 'storeDate', align: 'center',title: '搴撻緞(澶�)', sort:true}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+ ,{field: 'model', align: 'center',title: '浠ｇ爜'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index 3a96c09..3335f88 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -33,6 +33,7 @@
{field: 'lkQty', title:'绔嬪簱鏁伴噺', align: 'center', width:150},
{field: 'erpQty', title:'ERP鏁伴噺', align: 'center', width:150},
{field: 'matnr', title:'浜у搧缂栫爜', align: 'center'},
+ {field: 'model', title:'浜у搧浠ｇ爜', align: 'center'},
{field: 'specs', title:'浜у搧瑙勬牸', align: 'center'},
{field: 'maktx', title:'浜у搧鍚嶇О', align: 'center'},
{field: 'pgNO', title:'娲惧伐鍗曞彿', align: 'center'},
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index ad09170..f379902 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -44,7 +44,7 @@
{type: 'numbers'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
{field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
- {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
+ {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 240, width: 240},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
@@ -122,8 +122,9 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 150},
+ {field: 'model', title: '鐗╂枡浠ｇ爜', width: 150},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 150},
{field: 'batch', title: '鎵瑰彿'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index be85831..2c1b1c1 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -36,6 +36,7 @@
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
@@ -159,8 +160,10 @@
// {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
- {field: 'batch', title: '搴忓垪鐮�', align: 'center'},
+ {field: 'batch', title: '鎵规', align: 'center'},
+ {field: 'sPgNO', title: '娲惧伐鍗曞彿', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
+ {field: 'zpallet', align: 'center',title: '鎵樼洏鐮�'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
{field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
{type: 'checkbox', merge: ['locNo']},
--
Gitblit v1.9.1