From eb151270cf5ec0166d11ad59af42785cf31b183c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 06 九月 2024 15:18:46 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/OutLocOrderExcelListener.java | 267 ++++++++++++++++++++
zy-asrs-wms/src/main/webapp/static/js/pakStore/stockOutOrder.js | 243 ++++++++++++++++++
zy-asrs-wms/src/main/webapp/views/pakStore/stockOutOrder.html | 144 +++++++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/LocInPrintMatExcelListener.java | 24 +
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/OutLocOrderExcel.java | 26 ++
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/LocInPrintMatExcel.java | 6
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java | 27 ++
7 files changed, 726 insertions(+), 11 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/LocInPrintMatExcel.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/LocInPrintMatExcel.java
index 6d298a4..4c99ed4 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/LocInPrintMatExcel.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/LocInPrintMatExcel.java
@@ -15,9 +15,9 @@
public class LocInPrintMatExcel extends Mat {
@ExcelProperty(index = 0, value = "鍝佸彿")
private String matnr;
- @ExcelProperty(index = 1, value = "鍝佸悕")
- private String matax;
- @ExcelProperty(index = 2, value = "鎵撳嵃鏁伴噺")
+// @ExcelProperty(index = 1, value = "鍝佸悕")
+// private String matax;
+ @ExcelProperty(index = 1, value = "鎵撳嵃鏁伴噺")
private String anfme;
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/OutLocOrderExcel.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/OutLocOrderExcel.java
new file mode 100644
index 0000000..76cec77
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/OutLocOrderExcel.java
@@ -0,0 +1,26 @@
+package com.zy.asrs.common.domain.entity;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.zy.asrs.common.wms.entity.Mat;
+import lombok.Data;
+
+/**
+ * 0.A 1.B 2.C 3.D 4.E 5.F 6.G 7.H 8.I
+ * 9.J 10.K 11.L 12.M 13.N 14.O 15.P 16.Q 17.R 18.S
+ * 19.T 20.U 21.V 22.W 23.X 24.Y 25.Z
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class OutLocOrderExcel extends Mat {
+ @ExcelProperty(index = 0, value = "璁㈠崟鍙�")
+ private String order;
+ @ExcelProperty(index = 1, value = "鍗曟嵁绫诲瀷")
+ private String sign;
+ @ExcelProperty(index = 2, value = "鍝佸彿")
+ private String matnr;
+ @ExcelProperty(index = 3, value = "鏁伴噺")
+ private String anfme;
+ @ExcelProperty(index = 4, value = "姝ゅ垪涓哄娉�==銆嬩笉鐢ㄥ～鍐�==銆嬭鍗曞彿涓庡崟鎹被鍨嬪彧闇�瑕佸～鍐欑涓�鍒楀嵆鍙�")
+ private String memo1;
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/LocInPrintMatExcelListener.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/LocInPrintMatExcelListener.java
index 56512a2..4241eb3 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/LocInPrintMatExcelListener.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/LocInPrintMatExcelListener.java
@@ -6,8 +6,11 @@
import com.baomidou.mybatisplus.generator.config.IFileCreate;
import com.zy.asrs.common.domain.entity.LocInPrintMatExcel;
import com.zy.asrs.common.wms.entity.LocInPrintMat;
+import com.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.service.LocInPrintMatService;
+import com.zy.asrs.common.wms.service.MatService;
import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.framework.exception.CoolException;
import lombok.Data;
@@ -29,7 +32,7 @@
private int totalAnfme = 0;
private Long userId;
private Long hostId;
- List<String[]> OutLocBoxCs = new ArrayList<>();
+ List<String[]> printMatList = new ArrayList<>();
public LocInPrintMatExcelListener() {
}
@@ -67,9 +70,14 @@
} catch (Exception e){
throw new CoolException("鍝佸彿鍙傛暟涓虹┖");
}
+ MatService matService = SpringUtils.getBean(MatService.class);
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr));
+ if (Cools.isEmpty(mat)){
+ throw new CoolException("鍝佸彿:"+matnr+"涓嶅瓨鍦紝璇峰厛鏂板鍟嗗搧妗ｆ锛侊紒锛�");
+ }
String matax = "";
try{
- matax = excel.getMatax();
+ matax = mat.getMaktx();
} catch (Exception e){
matax = "";
}
@@ -93,7 +101,7 @@
s[0] = matnr;
s[1] = matax;
s[2] = anfme;
- OutLocBoxCs.add(s);
+ printMatList.add(s);
total++;
totalAnfme = totalAnfme+Integer.parseInt(anfme);
}
@@ -104,13 +112,13 @@
*/
@Override
public void doAfterAllAnalysed(AnalysisContext ctx) {
- if (!Cools.isEmpty(OutLocBoxCs) && OutLocBoxCs.size() != 0) {
+ if (!Cools.isEmpty(printMatList) && printMatList.size() != 0) {
LocInPrintMatService locInPrintMatService = SpringUtils.getBean(LocInPrintMatService.class);
Date now = new Date();
- for (String[] outLocBoxC:OutLocBoxCs){
- String matnr = outLocBoxC[0];
- String matax = outLocBoxC[1];
- String anfme = outLocBoxC[2];
+ for (String[] printMat:printMatList){
+ String matnr = printMat[0];
+ String matax = printMat[1];
+ String anfme = printMat[2];
Integer intAnfme = 1;
try{
Integer intAnfme1 = Integer.parseInt(anfme);
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/OutLocOrderExcelListener.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/OutLocOrderExcelListener.java
new file mode 100644
index 0000000..83aec6b
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/OutLocOrderExcelListener.java
@@ -0,0 +1,267 @@
+package com.zy.asrs.common.utils;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.common.domain.dto.DetlDto;
+import com.zy.asrs.common.domain.entity.OutLocOrderExcel;
+import com.zy.asrs.common.domain.param.OrderDomainParam;
+import com.zy.asrs.common.wms.entity.DocType;
+import com.zy.asrs.common.wms.entity.Mat;
+import com.zy.asrs.common.wms.entity.Order;
+import com.zy.asrs.common.wms.entity.OrderDetl;
+import com.zy.asrs.common.wms.service.DocTypeService;
+import com.zy.asrs.common.wms.service.MatService;
+import com.zy.asrs.common.wms.service.OrderDetlService;
+import com.zy.asrs.common.wms.service.OrderService;
+import com.zy.asrs.framework.common.*;
+import com.zy.asrs.framework.exception.CoolException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.*;
+
+/**
+ * Created by vincent on 2019-11-25
+ */
+@Slf4j
+public class OutLocOrderExcelListener extends AnalysisEventListener<OutLocOrderExcel> {
+
+ private int total = 0;
+ private String orderOneNo = null;
+ private String orderSign = null;
+ private Long orderSignId = null;
+
+ private int totalAnfme = 0;
+ private Long userId;
+ private Long hostId;
+ List<String[]> OutLocOrderCs = new ArrayList<>();
+ List<List<String[]>> OutLocOrderList = new ArrayList<>();
+
+ public OutLocOrderExcelListener() {
+ }
+
+ public OutLocOrderExcelListener(Long userId, Long hostId) {
+ this.userId = userId;
+ this.hostId = hostId;
+ }
+
+ /**
+ * 姣忛殧5鏉″瓨鍌ㄦ暟鎹簱锛屽疄闄呬娇鐢ㄤ腑鍙互3000鏉★紝鐒跺悗娓呯悊list 锛屾柟渚垮唴瀛樺洖鏀�
+ */
+ private static final int BATCH_COUNT = 50;
+
+ private final List<OutLocOrderExcel> list = new ArrayList<>();
+
+ /**
+ * 杩欓噷浼氫竴琛岃鐨勮繑鍥炲ご
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ }
+
+ /**
+ * 杩欎釜姣忎竴鏉℃暟鎹В鏋愰兘浼氭潵璋冪敤
+ */
+ @Override
+ public void invoke(OutLocOrderExcel excel, AnalysisContext ctx) {
+ if (Cools.isEmpty(orderOneNo)){
+ if (!Cools.isEmpty(excel.getOrder())){
+ orderOneNo = excel.getOrder();
+ } else {
+ throw new CoolException("璁㈠崟鍙峰弬鏁颁负绌�");
+ }
+ }
+ if (Cools.isEmpty(orderSign)){
+ if (!Cools.isEmpty(excel.getSign())){
+ orderSign = excel.getSign();
+ DocTypeService docTypeService = SpringUtils.getBean(DocTypeService.class);
+ DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocName, orderSign));
+ if (Cools.isEmpty(docType)){
+ throw new CoolException("涓嶅瓨鍦ㄧ殑鍗曟嵁绫诲瀷锛�"+orderSign);
+ }
+ orderSignId = docType.getDocId();
+ } else {
+ throw new CoolException("鍏ュ嚭搴撴爣璁板弬鏁颁负绌�");
+ }
+ }
+ String matnr = "";
+ try{
+ matnr = excel.getMatnr();
+ if (Cools.isEmpty(matnr)){
+ throw new CoolException("鍝佸彿鍙傛暟涓虹┖");
+ }
+ } catch (Exception e){
+ throw new CoolException("鍝佸彿鍙傛暟涓虹┖");
+ }
+ MatService matService = SpringUtils.getBean(MatService.class);
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr));
+ if (Cools.isEmpty(mat)){
+ throw new CoolException("鍝佸彿:"+matnr+"涓嶅瓨鍦紝璇峰厛鏂板鍟嗗搧妗ｆ锛侊紒锛�");
+ }
+ String anfme = "0";
+ try{
+ String anfme1 = excel.getAnfme();
+ try{
+ Integer anfmeInt = Integer.parseInt(anfme1);
+ if (!Cools.isEmpty(anfmeInt) && anfmeInt>0){
+ anfme = anfmeInt.toString();
+ } else {
+ throw new CoolException("鏁伴噺鍙傛暟涓虹┖");
+ }
+ } catch (Exception e){
+ throw new CoolException("鏁伴噺鍙傛暟涓虹┖");
+ }
+ } catch (Exception e){
+ throw new CoolException("鏁伴噺鍙傛暟涓虹┖");
+
+ }
+
+ String[] s=new String[2];
+ s[0] = matnr;
+ s[1] = anfme;
+ OutLocOrderCs.add(s);
+ total++;
+// totalAnfme = totalAnfme+Integer.parseInt(anfme);
+ }
+
+ /**
+ * 鎵�鏈夋暟鎹В鏋愬畬鎴愪簡璋冪敤
+ * 閫傚悎浜嬪姟
+ */
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext ctx) {
+ if (!Cools.isEmpty(OutLocOrderCs) && OutLocOrderCs.size() != 0) {
+ ArrayList<String> matnrSign = new ArrayList<>();
+ for (String[] outLocOrderCs : OutLocOrderCs){
+ if (!matnrSign.contains(outLocOrderCs[0])){
+ matnrSign.add(outLocOrderCs[0]);
+ } else {
+ throw new CoolException("鍝佸彿鍙傛暟瀛樺湪閲嶅琛岋細"+outLocOrderCs[0]);
+ }
+ }
+ MatService matService = SpringUtils.getBean(MatService.class);
+
+ OrderDomainParam orderDomainParam = new OrderDomainParam();
+ orderDomainParam.setDocType(orderSignId);
+ orderDomainParam.setOrderNo(orderOneNo);
+ List<OrderDetl> orderDetlList = new ArrayList<>();
+ for (String[] outLocOrderCs : OutLocOrderCs){
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.setOrderNo(orderOneNo);
+ orderDetl.setAnfme(Double.parseDouble(outLocOrderCs[1]));
+
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, outLocOrderCs[0]));
+
+ orderDetl.setMatnr(mat.getMatnr());
+ orderDetl.setMaktx(mat.getMaktx());
+ orderDetl.setBatch(mat.getBatch());
+ orderDetl.setBarcode(mat.getBarcode());
+ orderDetl.setSpecs(mat.getSpecs());
+ orderDetl.setModel(mat.getModel());
+ orderDetl.setStatus(1);
+ orderDetl.setMemo(mat.getMemo());
+ orderDetl.setHostId(hostId);
+ orderDetlList.add(orderDetl);
+ }
+ orderDomainParam.setOrderDetlList(orderDetlList);
+ boolean formAddOrder = formAddOrder(orderDomainParam);
+ if (!formAddOrder){
+ throw new CoolException("鐢熸垚璁㈠崟澶辫触");
+ }
+
+ }
+
+ log.info("鎴愬姛瀵煎叆{}鏉¤鍗曟槑缁嗭紒", total);
+ }
+
+ public int[] getTotal() {
+ return new int[]{total};
+ }
+
+ public boolean formAddOrder(OrderDomainParam param){
+ OrderService orderService = SpringUtils.getBean(OrderService.class);
+ JdbcTemplate jdbcTemplate = SpringUtils.getBean(JdbcTemplate.class);
+ SnowflakeIdWorker snowflakeIdWorker = SpringUtils.getBean(SnowflakeIdWorker.class);
+ OrderDetlService orderDetlService = SpringUtils.getBean(OrderDetlService.class);
+
+ Order order = orderService.selectByNo(param.getOrderNo(), hostId);
+ if (order != null) {
+ throw new CoolException("鍗曟嵁缂栧彿宸插瓨鍦�");
+ }
+ // 鍒ゆ柇閲嶅璁㈠崟鍙�
+ Integer orderCount = Optional.ofNullable(jdbcTemplate.queryForObject("select count(1) from man_order where order_no = '" + param.getOrderNo() + "'", Integer.class)).orElse(0);
+ Integer orderLogCount = Optional.ofNullable(jdbcTemplate.queryForObject("select count(1) from man_order_log where order_no = '" + param.getOrderNo() + "'", Integer.class)).orElse(0);
+ if (orderCount > 0 || orderLogCount > 0) {
+ throw new CoolException("鍗曟嵁缂栧彿宸插瓨鍦�");
+ }
+ Date now = new Date();
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ param.getOrderNo(), // 璁㈠崟缂栧彿
+ DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ param.getDocType(), // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ null, // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ userId, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ userId, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 澶囨敞
+ hostId
+ );
+ if (!orderService.save(order)) {
+ throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触");
+ }
+ List<DetlDto> list = new ArrayList<>();
+ for (OrderDetl orderDetl : param.getOrderDetlList()) {
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
+ if (DetlDto.has(list, dto)) {
+ OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
+ item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
+ if (!orderDetlService.updateById(item)) {
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ }
+ } else {
+ list.add(dto);
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(userId);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(userId);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ orderDetl.setWorkQty(0.0D);
+ if (!orderDetlService.save(orderDetl)) {
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ }
+ }
+ }
+ return true;
+ }
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
index 157d8ff..00adcbe 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
@@ -8,6 +8,7 @@
import com.zy.asrs.common.domain.entity.LocInPrintMatExcel;
import com.zy.asrs.common.domain.entity.MatExcel;
import com.zy.asrs.common.domain.entity.MatPrint;
+import com.zy.asrs.common.domain.entity.OutLocOrderExcel;
import com.zy.asrs.common.utils.*;
import com.zy.asrs.common.wms.entity.LocInPrintMat;
import com.zy.asrs.common.wms.entity.Mat;
@@ -324,4 +325,30 @@
return R.ok("鎴愬姛瀵煎叆"+listener.getTotal()[0]+"绉嶅緟鎵撳嵃鐗╂枡淇℃伅锛屽叡鐢熸垚"+listener.getTotal()[1]+"鏉″緟鎵撳嵃鏉＄爜锛�");
}
+ /**
+ * excel瀵煎叆妯℃澘涓嬭浇
+ */
+ @RequestMapping(value = "/out/loc/box/excel/import/out/mould")
+ public void outLocBoxExcelImportOutMould(HttpServletResponse response) throws IOException {
+ List<OutLocOrderExcel> excels = new ArrayList<>();
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ String fileName = URLEncoder.encode("瀵煎叆璁㈠崟淇℃伅鍑哄簱妯℃澘", "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ EasyExcel.write(response.getOutputStream(), OutLocOrderExcel.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .sheet("鍑哄簱妯℃澘")
+ .doWrite(excels);
+ }
+
+ // excel瀵煎叆
+ @PostMapping(value = "/out/loc/box/excel/import/out/auth")
+ @ManagerAuth(memo = "瀵煎叆璁㈠崟淇℃伅鍑哄簱")
+ @Transactional
+ public R outLocBoxExcelImportOut(MultipartFile file) throws IOException {
+ OutLocOrderExcelListener listener = new OutLocOrderExcelListener(getUserId(), getHostId());
+ EasyExcel.read(file.getInputStream(), OutLocOrderExcel.class, listener).sheet().doRead();
+ return R.ok("鎴愬姛瀵煎叆"+listener.getTotal()[0]+"鏉¤鍗曟槑缁嗭紒");
+ }
+
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/pakStore/stockOutOrder.js b/zy-asrs-wms/src/main/webapp/static/js/pakStore/stockOutOrder.js
new file mode 100644
index 0000000..424b26e
--- /dev/null
+++ b/zy-asrs-wms/src/main/webapp/static/js/pakStore/stockOutOrder.js
@@ -0,0 +1,243 @@
+var locDetlLayerIdx;
+var locDetlData = [];
+var admin;
+function getCol() {
+ var cols = [
+ // {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'},
+ {field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ ];
+ arrRemove(detlCols, 'field', 'anfme');
+ cols.push.apply(cols, detlCols);
+ cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80})
+ return cols;
+}
+
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function() {
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var form = layui.form;
+ admin = layui.admin;
+
+ tableIns = table.render({
+ elem: '#chooseData',
+ headers: {token: localStorage.getItem('token')},
+ data: [],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ limit: 500,
+ cols: [getCol()],
+ done: function(res, curr, count) {
+ limit();
+ getOutBound();
+ }
+ });
+
+ // 椤甸潰淇敼
+ table.on('edit(chooseData)', function (obj) {
+ let index = obj.tr.attr("data-index");
+ let data = locDetlData[index];
+ let modify = true;
+ // if (obj.field === 'count'){
+ // let vle = Number(obj.value);
+ // if (isNaN(vle)) {
+ // layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
+ // modify = false;
+ // } else {
+ // if (vle <= 0) {
+ // layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
+ // modify = false;
+ // }
+ // if (vle > Number(data.anfme)) {
+ // layer.msg("鍑哄簱鏁伴噺涓嶅緱澶т簬搴撳瓨鏁伴噺", {icon: 2});
+ // modify = false;
+ // }
+ // }
+ // }
+ if (modify) {
+ data[obj.field] = obj.value;
+ }
+ tableIns.reload({data: locDetlData});
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(chooseData)', function (obj) {
+ switch (obj.event) {
+ case 'outbound':
+ if (locDetlData.length === 0){
+ layer.msg('璇峰厛鎻愬彇鍟嗗搧搴撳瓨', {icon: 2});
+ } else {
+ // var staNo = $("#staNoSelect").val();
+ // if (staNo === "" || staNo === null){
+ // layer.msg("璇烽�夋嫨鍑哄簱鍙�", {icon: 2});
+ // return;
+ // }
+ var orderNo = $("#orderNo").val();
+ if (orderNo === "" || orderNo === null){
+ layer.msg("璇疯緭鍏ュ嚭搴撳崟鍙�", {icon: 2});
+ return;
+ }
+ for (var i=0;i<locDetlData.length;i++){
+ locDetlData[i]["orderNo"]=orderNo
+ }
+ console.log(locDetlData)
+ console.log(locDetlData[0])
+ let param = {
+ orderNo: orderNo,
+ locDetls: locDetlData
+ }
+ $.ajax({
+ url: baseUrl+"/plate/order/out/start",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ locDetlData = [];
+ tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}});
+ layer.msg(res.msg, {icon: 1});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ }
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(chooseData)', function(obj){
+ switch (obj.event) {
+ case 'remove':
+ let index = obj.tr.attr("data-index");
+ locDetlData.splice(index, 1);
+ tableIns.reload({data: locDetlData});
+ break;
+ }
+ });
+
+ // 鑾峰彇鍑哄簱鍙�
+ function getOutBound(){
+ $.ajax({
+ url: baseUrl+"/available/take/site",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ var tpl = $("#takeSiteSelectTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#staNoSelect').append(html);
+ form.render('select');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+
+
+ $(document).on('click','#mat-query', function () {
+ let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+ locDetlLayerIdx = layer.open({
+ type: 2,
+ title: false,
+ closeBtn: false,
+ maxmin: false,
+ area: ['90%', '85%'],
+ shadeClose: true,
+ content: 'locDetlQuery.html',
+ success: function(layero, index){
+ layer.close(loadIndex);
+ }
+ });
+ })
+
+})
+
+// 娣诲姞琛ㄦ牸鏁版嵁
+function addTableData(data) {
+ for (var i=0;i<data.length;i++){
+ let pass = false;
+ for (var j=0;j<locDetlData.length;j++){
+ if (data[i].matnr === locDetlData[j].matnr && data[i].batch === locDetlData[j].batch && data[i].locNo$ === locDetlData[j].locNo$) {
+ pass = true;
+ break;
+ }
+ }
+ if (pass) {
+ data.splice(i--, 1);
+ } else {
+ data[i]["count"] = data[i]["anfme"];
+ }
+ }
+ locDetlData.push.apply(locDetlData, data);
+ tableIns.reload({data: locDetlData});
+ layer.close(locDetlLayerIdx);
+}
+
+
+// excel瀵煎叆妯℃澘涓嬭浇
+function excelMouldDownload(){
+ layer.load(1, {shade: [0.1,'#fff']});
+ location.href = baseUrl + "/out/loc/box/excel/import/out/mould";
+ layer.closeAll('loading');
+}
+
+// excel瀵煎叆
+function importExcel() {
+ $("#importExcel").trigger("click");
+}
+function upload(obj){
+ if(!obj.files) {
+ return;
+ }
+ var file = obj.files[0];
+ admin.confirm('纭鍚屾 [' + file.name +'] 鏂囦欢鍚楋紵', function (index) {
+ layer.load(1, {shade: [0.1,'#fff']});
+ var url = baseUrl + "/out/loc/box/excel/import/out/auth";
+ var form = new FormData();
+ form.append("file", file);
+ xhr = new XMLHttpRequest();
+ xhr.open("post", url, true); //post鏂瑰紡锛寀rl涓烘湇鍔″櫒璇锋眰鍦板潃锛宼rue 璇ュ弬鏁拌瀹氳姹傛槸鍚﹀紓姝ュ鐞嗐��
+ xhr.setRequestHeader('token', localStorage.getItem('token'));
+ xhr.onload = uploadComplete; //璇锋眰瀹屾垚
+ xhr.onerror = uploadFailed; //璇锋眰澶辫触
+ xhr.onloadend = function () { // // 涓婁紶瀹屾垚閲嶇疆鏂囦欢娴�
+ layer.closeAll('loading');
+ $("#importExcel").val("");
+ };
+ // xhr.upload.onprogress = progressFunction;//銆愪笂浼犺繘搴﹁皟鐢ㄦ柟娉曞疄鐜般��
+ xhr.upload.onloadstart = function(){//涓婁紶寮�濮嬫墽琛屾柟娉�
+ ot = new Date().getTime(); //璁剧疆涓婁紶寮�濮嬫椂闂�
+ oloaded = 0;//璁剧疆涓婁紶寮�濮嬫椂锛屼互涓婁紶鐨勬枃浠跺ぇ灏忎负0
+ };
+ xhr.send(form);
+ }, function(index){
+ $("#importExcel").val("");
+ });
+}
+function uploadComplete(evt) {
+ var res = JSON.parse(evt.target.responseText);
+ if(res.code === 200) {
+ layer.msg(res.msg, {icon: 1});
+ loadTree("");
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+}
+function uploadFailed(evt) {
+ var res = JSON.parse(evt.target.responseText);
+ layer.msg(res.msg, {icon: 2});
+}
\ No newline at end of file
diff --git a/zy-asrs-wms/src/main/webapp/views/pakStore/stockOutOrder.html b/zy-asrs-wms/src/main/webapp/views/pakStore/stockOutOrder.html
new file mode 100644
index 0000000..f085535
--- /dev/null
+++ b/zy-asrs-wms/src/main/webapp/views/pakStore/stockOutOrder.html
@@ -0,0 +1,144 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+ <style>
+ html {
+ height: 100%;
+ padding: 10px;
+ background-color: #f1f1f1;
+ box-sizing: border-box;
+ }
+ body {
+ background-color: #fff;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+ padding-bottom: 20px;
+ }
+
+ #staNoSpan {
+ text-align: center;
+ display: inline-block;
+ width: 100px;
+ font-size: 13px;
+ }
+ .layui-btn-container .layui-form-select {
+ display: inline-block;
+ width: 150px;
+ height: 30px;
+ }
+ .layui-btn-container .layui-form-select.layui-form-selected {
+ display: inline-block;
+ width: 150px;
+ }
+ .layui-btn-container .layui-select-title input {
+ font-size: 13px;
+ }
+ .layui-btn-container .layui-anim.layui-anim-upbit dd {
+ font-size: 13px;
+ }
+
+ #btn-outbound {
+ margin-left: 60px;
+ display: none;
+ }
+
+ /*----------------------------------*/
+ .function-area {
+ padding: 20px 50px;
+ }
+ .function-btn {
+ font-size: 16px;
+ padding: 1px 2px;
+ width: 100px;
+ height: 50px;
+ border-color: #2b425b;
+ border-radius: 4px;
+ border-width: 2px;
+ background: none;
+ border-style: solid;
+ transition: 0.4s;
+ cursor: pointer;
+ letter-spacing: 1.5px;
+ }
+ .function-btn:hover {
+ background-color: #2b425b;
+ color: #fff;
+ }
+
+ #mat-query {
+ display: none;
+ }
+ </style>
+</head>
+<body>
+
+<!-- 鍔熻兘鍖� -->
+<div class="function-area">
+ <button id="mat-query" class="function-btn">鎻愬彇搴撳瓨</button>
+ <button class="function-btn" style="width: auto;float:right;" onclick="excelMouldDownload()">瀵煎叆璁㈠崟淇℃伅鍑哄簱妯℃澘涓嬭浇</button>
+</div>
+
+<hr>
+
+<!-- 琛ㄦ牸 -->
+<div style="padding-bottom: 5px; margin-bottom: 45px">
+
+ <!-- 澶撮儴 -->
+ <script type="text/html" id="toolbar">
+ <div class="layui-form">
+ <div class="layui-form layui-card-header">
+<!-- <span id="memeoSpan" style="margin-left: 25px">璁㈠崟鍙凤細</span>-->
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="orderNo" class="layui-input" type="text" name="orderNo" placeholder="璁㈠崟鍙�" autocomplete="off" style="margin-left: 15px;width: 300px">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">鍚姩鍑哄簱</button>-->
+ <!-- 3.瀵煎叆绠卞彿鍑哄簱 -->
+ <button class="layui-btn layui-btn-lg" onclick="importExcel()" style="font-size: 12px;width: auto;">瀵煎叆璁㈠崟淇℃伅鍑哄簱</button>
+ <span style="display: none"><input id="importExcel" type="file" onchange="upload(this)">鍚姩鍑哄簱</span>
+ </div>
+<!-- <div class="layui-btn-container">-->
+<!-- <!– 1.閫夋嫨鍑哄簱鍙� –>-->
+<!-- <span id="staNoSpan">璁㈠崟鍙凤細</span>-->
+<!-- <select id="staNoSelect" lay-verify="required">-->
+<!-- <option value="">璇烽�夋嫨绔欑偣</option>-->
+<!-- </select>-->
+ <!-- 2.鍚姩鍑哄簱 -->
+
+<!-- </div>-->
+ </div>
+ </script>
+
+ <!-- 琛� -->
+ <script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">绉婚櫎</a>
+ </script>
+
+ <table class="layui-table" id="chooseData" lay-filter="chooseData"></table>
+</div>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<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/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/pakStore/stockOutOrder.js" charset="utf-8"></script>
+
+<script type="text/template" id="takeSiteSelectTemplate">
+ {{#each data}}
+ <option value="{{siteId}}">{{desc}}</option>
+ {{/each}}
+</script>
+</body>
+</html>
+
--
Gitblit v1.9.1