diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java
index fae3661..1fcad53 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java
@@ -288,6 +288,10 @@ public class DmYdjh implements Serializable {
private String slkcxx; // 所有库存信息
private Integer slycldw; // 预处理垛位
private Integer slyclcs; // 预处理垛位
+ private String nbsbm; // 预处理垛位
+ private String sllsh; // 预处理垛位
+ private String sldrry; // 预处理垛位
+ private String sldrrq; // 预处理垛位
// 派工及反馈
private String slpgry; // 派工人
diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java
index a307c6e..0d2d9ef 100644
--- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java
@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
/**
*
- * 前端控制器
+ * 前端控制器 // 入库批号
*
*
* @author xn
@@ -83,6 +83,7 @@ public class PgdSljhController {
@PostMapping("/slPrint")
@ResponseBody
+ @AuthFunction
public ResultBean slPrint(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException {
//ls_lsh = F_GETPJH("MM",'00',"MSMS")
String id = syService.f_getpjh("MM", "00", "MSMS");
@@ -109,6 +110,9 @@ public class PgdSljhController {
// 库存主键 没存
ydjh.setId(slKc.getYdid());
ydjh.setZt("11");
+ ydjh.setSllsh(id);
+ ydjh.setSldrrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm"));
+ ydjh.setSldrry((String) req.getAttribute("yhms"));
ydupList.add(ydjh);
}
}
@@ -195,7 +199,7 @@ public class PgdSljhController {
}
- imCkwpkwpService.updateBatchByMultiId(ckupList);
+ //imCkwpkwpService.updateBatchByMultiId(ckupList);
List qgkws = dm_zhbmpRepository.findByBMLB("QGKW");
@@ -417,6 +421,7 @@ public class PgdSljhController {
dmYdjh.setSlxhth(slKc.getGCDDH());
dmYdjh.setSlhth(slKc.getDcFd());
dmYdjh.setSlwlh(slKc.getWPH());
+ dmYdjh.setNbsbm(slKc.getNBSBM());
dmYdjh.setSlycldw((Integer) map.get("dw"));
@@ -518,6 +523,7 @@ public class PgdSljhController {
dmYdjh.setSlcs(slKc.getCFCS1());
dmYdjh.setSlxhth(slKc.getGCDDH());
dmYdjh.setSlhth(slKc.getDcFd());
+ dmYdjh.setNbsbm(slKc.getNBSBM());
dmYdjh.setSlwlh(slKc.getWPH());
dmYdjh.setKcch(slKc.getDCCH());
imCkwpkwp.setZylx(getLx(dmYdjh.getLqlb(), dmYdjh.getZl(),dmYdjh.getTzbh()));
@@ -536,6 +542,7 @@ public class PgdSljhController {
dmYdjh.setSlcs(slKc.getCFCS1());
dmYdjh.setSlxhth(slKc.getGCDDH());
dmYdjh.setSlhth(slKc.getDcFd());
+ dmYdjh.setNbsbm(slKc.getNBSBM());
dmYdjh.setSlwlh(slKc.getWPH());
dmYdjh.setKcch(slKc.getDCCH());
dmYdjh.setId(slKc.getYdid());
@@ -917,6 +924,7 @@ public class PgdSljhController {
dmYdjh.setSlcs(slKc.getCFCS1());
dmYdjh.setSlxhth(slKc.getGCDDH());
dmYdjh.setSlhth(slKc.getDcFd());
+ dmYdjh.setNbsbm(slKc.getNBSBM());
dmYdjh.setSlwlh(slKc.getWPH());
dmYdjh.setSlycldw((Integer) map.get("dw"));
@@ -985,6 +993,7 @@ public class PgdSljhController {
ydjh.setSlcs("");
ydjh.setSlxhth("");
ydjh.setSlhth("");
+ ydjh.setNbsbm("");
ydjh.setSlwlh("");
ydjh.setKcch("");