From 75b8acaa4617ec20d6da616b8ccf02b1f71fdc69 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 22 三月 2022 15:37:05 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pickout/pickout.html | 12 +
src/main/java/zy/cloud/wms/manager/entity/Pickout.java | 15 +
src/main/java/zy/cloud/wms/manager/service/PickoutService.java | 1
src/main/webapp/static/js/wave/wave.js | 6
src/main/java/zy/cloud/wms/manager/service/impl/WaveServiceImpl.java | 71 ++++++++-
src/main/java/zy/cloud/wms/manager/controller/PickoutController.java | 5
src/main/java/zy/cloud/wms/common/service/MainService.java | 2
src/main/java/zy/cloud/wms/manager/controller/WaveController.java | 6
src/main/java/zy/cloud/wms/manager/mapper/PickoutMapper.java | 2
src/main/java/zy/cloud/wms/manager/service/impl/PickoutServiceImpl.java | 4
src/main/java/zy/cloud/wms/common/model/MatnrDto.java | 1
src/main/java/zy/cloud/wms/manager/entity/StoPreTab.java | 2
src/main/resources/mapper/PickoutMapper.xml | 6
src/main/webapp/static/js/order/order.js | 1
src/main/java/zy/cloud/wms/common/model/PickOutDto.java | 20 ++
src/main/webapp/static/js/pickout/pickout.js | 261 ++++++++++++++++++++-----------------
src/main/java/zy/cloud/wms/manager/service/WaveService.java | 5
17 files changed, 271 insertions(+), 149 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/model/MatnrDto.java b/src/main/java/zy/cloud/wms/common/model/MatnrDto.java
index 1612c11..190c95e 100644
--- a/src/main/java/zy/cloud/wms/common/model/MatnrDto.java
+++ b/src/main/java/zy/cloud/wms/common/model/MatnrDto.java
@@ -14,4 +14,5 @@
private String batch;
+
}
diff --git a/src/main/java/zy/cloud/wms/common/model/PickOutDto.java b/src/main/java/zy/cloud/wms/common/model/PickOutDto.java
new file mode 100644
index 0000000..072aee3
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/common/model/PickOutDto.java
@@ -0,0 +1,20 @@
+package zy.cloud.wms.common.model;
+
+import lombok.Data;
+
+@Data
+public class PickOutDto {
+ private Integer anfme;
+ private String locNo;
+ private String maktx;
+ private String matnr;
+ private Integer nodeId;
+ private Boolean prior;
+ private Integer reduce;
+ private Integer remQty;
+ private String title;
+ private Integer total;
+ private Integer type;
+ private String waveId;
+
+}
diff --git a/src/main/java/zy/cloud/wms/common/service/MainService.java b/src/main/java/zy/cloud/wms/common/service/MainService.java
index d3e184d..ec44a62 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -538,6 +538,7 @@
tab.setPrior(false);
tab.setPrior$("脳");
tab.setType(0);
+ tab.setWaveId(waveStoDto.getOrderNo());
res.add(tab);
}
@@ -562,6 +563,7 @@
tab.setPrior(locDetlService.isPrior(locDetl.getNodeId(), mat.getMatnr()));
tab.setPrior$(tab.getPrior()?"鉁�":"脳");
tab.setType(1);
+ tab.setWaveId(waveStoDto.getOrderNo());
res.add(tab);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
diff --git a/src/main/java/zy/cloud/wms/manager/controller/PickoutController.java b/src/main/java/zy/cloud/wms/manager/controller/PickoutController.java
index 1e03a1c..2ab4c98 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/PickoutController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/PickoutController.java
@@ -82,9 +82,12 @@
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
- pickoutDetlService.delete(new EntityWrapper<PickoutDetl>()
+ Pickout picout = pickoutService.selectOne(new EntityWrapper<Pickout>()
+ .eq("id", id));
+ pickoutDetlService.delete(new EntityWrapper<PickoutDetl>()
.eq("head_id",id));
pickoutService.deleteById(id);
+ pickoutService.updateWaveStatus(picout.getWaveNo());
}
return R.ok();
}
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WaveController.java b/src/main/java/zy/cloud/wms/manager/controller/WaveController.java
index 3982916..f8aa130 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WaveController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WaveController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
+import zy.cloud.wms.common.model.PickOutDto;
import zy.cloud.wms.manager.entity.Wave;
import zy.cloud.wms.manager.entity.WaveDetl;
import zy.cloud.wms.manager.entity.param.StockOutParam;
@@ -162,9 +163,8 @@
@RequestMapping("/wave/createOut")
@ManagerAuth
- public R createWaveOut(@RequestBody Wave wave){
-
- return waveService.createOut(wave,getUserId(),getHostId());
+ public R createWaveOut(@RequestBody List<PickOutDto> pickOutDtosk){
+ return waveService.createOut(pickOutDtosk,getUserId(),getHostId());
}
@RequestMapping("/wave/preview")
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Pickout.java b/src/main/java/zy/cloud/wms/manager/entity/Pickout.java
index 30ff890..804a8f3 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Pickout.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Pickout.java
@@ -97,6 +97,10 @@
@TableField("order_nos")
private String orderNos;
+
+ @TableField("wave_no")
+ private String waveNo;
+
public Pickout() {}
@@ -115,13 +119,16 @@
public String getWrkSts$(){
if (this.wrkSts == 1) {
- return "鏈嫞璐�";
- }
- if (this.wrkSts == 2) {
return "鏈墦鍗�";
}
+ if (this.wrkSts == 2) {
+ return "鏈嫞璐�";
+ }
if (this.wrkSts == 3) {
- return "宸插畬鎴�";
+ return "寮�濮嬫嫞璐�";
+ }
+ if (this.wrkSts == 4) {
+ return "鎷ｈ揣瀹屾垚";
}
return "";
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/StoPreTab.java b/src/main/java/zy/cloud/wms/manager/entity/StoPreTab.java
index e32e995..3bd238a 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/StoPreTab.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/StoPreTab.java
@@ -32,4 +32,6 @@
private Integer type;
+ private String waveId;
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/PickoutMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/PickoutMapper.java
index 071d83a..5d23ced 100644
--- a/src/main/java/zy/cloud/wms/manager/mapper/PickoutMapper.java
+++ b/src/main/java/zy/cloud/wms/manager/mapper/PickoutMapper.java
@@ -1,5 +1,6 @@
package zy.cloud.wms.manager.mapper;
+import org.apache.ibatis.annotations.Param;
import zy.cloud.wms.manager.entity.Pickout;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -9,4 +10,5 @@
@Repository
public interface PickoutMapper extends BaseMapper<Pickout> {
+ void updateWaveStatus(@Param("waveNo") String waveNo);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/PickoutService.java b/src/main/java/zy/cloud/wms/manager/service/PickoutService.java
index 8191757..c5269bb 100644
--- a/src/main/java/zy/cloud/wms/manager/service/PickoutService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/PickoutService.java
@@ -5,4 +5,5 @@
public interface PickoutService extends IService<Pickout> {
+ void updateWaveStatus(String waveNo);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/WaveService.java b/src/main/java/zy/cloud/wms/manager/service/WaveService.java
index fa52561..cd4839b 100644
--- a/src/main/java/zy/cloud/wms/manager/service/WaveService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/WaveService.java
@@ -1,10 +1,13 @@
package zy.cloud.wms.manager.service;
import com.core.common.R;
+import zy.cloud.wms.common.model.PickOutDto;
import zy.cloud.wms.manager.entity.Wave;
import com.baomidou.mybatisplus.service.IService;
+import java.util.List;
+
public interface WaveService extends IService<Wave> {
- R createOut(Wave wave, Long userId, Long hostId);
+ R createOut(List<PickOutDto> pickOutDtosk, Long userId, Long hostId);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/PickoutServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/PickoutServiceImpl.java
index 2394c74..c0d5357 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/PickoutServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/PickoutServiceImpl.java
@@ -9,4 +9,8 @@
@Service("pickoutService")
public class PickoutServiceImpl extends ServiceImpl<PickoutMapper, Pickout> implements PickoutService {
+ @Override
+ public void updateWaveStatus(String waveNo) {
+ this.baseMapper.updateWaveStatus(waveNo);
+ }
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WaveServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WaveServiceImpl.java
index cdce31c..4360bf9 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WaveServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WaveServiceImpl.java
@@ -5,16 +5,16 @@
import com.core.common.R;
import com.core.exception.CoolException;
import org.springframework.beans.factory.annotation.Autowired;
-import zy.cloud.wms.manager.entity.WaveDetl;
+import zy.cloud.wms.common.model.PickOutDto;
+import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.mapper.WaveMapper;
-import zy.cloud.wms.manager.entity.Wave;
-import zy.cloud.wms.manager.service.OrderService;
-import zy.cloud.wms.manager.service.WaveDetlService;
-import zy.cloud.wms.manager.service.WaveService;
+import zy.cloud.wms.manager.service.*;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashSet;
import java.util.List;
@@ -26,23 +26,72 @@
private OrderService orderService;
@Autowired
private WaveService waveService;
+ @Autowired
+ private PickoutService pickoutService;
+ @Autowired
+ private PickoutDetlService pickoutDetlService;
+ @Autowired
+ private MatService matService;
/**
* 閫氳繃娉㈡鐢熸垚鎷ｈ揣鍗�
- * @param wave
+ * @param
* @param userId
* @param hostId
*/
@Override
- public R createOut(Wave wave, Long userId, Long hostId) {
+ public R createOut(List<PickOutDto> pickOutDtosk, Long userId, Long hostId) {
HashSet<String> orderIds = new HashSet<>();
/**
* 鎺х
*/
+ if (Cools.isEmpty(pickOutDtosk)) {
+ throw new CoolException("鏁版嵁浼犺緭閿欒,璇疯仈绯荤鐞嗗憳");
+ }
+ Wave wave = waveService.selectOne(new EntityWrapper<Wave>()
+ .eq("id", pickOutDtosk.get(0).getWaveId()));
List<WaveDetl> waveDetls = waveDetlService.selectList(new EntityWrapper<WaveDetl>()
.eq("wave_id", wave.getId()));
- if (Cools.isEmpty(waveDetls)) {
- throw new CoolException("鎵句笉鍒拌娉㈡鍗曠殑璇︽儏,璇疯仈绯荤鐞嗗憳");
+
+ /**
+ * 鐢熸垚鎷ｈ揣鍗�
+ */
+ Pickout pickout = new Pickout();
+ pickout.setHostId(hostId);
+ pickout.setUserId(userId);
+ pickout.setWrkNo("PO-"+new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()));
+ pickout.setWrkSts(1L);
+ pickout.setCreateBy(userId.intValue());
+ pickout.setUpdateBy(userId.intValue());
+ pickout.setOrderQty(wave.getOrdersQty());
+ pickout.setWaveNo(wave.getWaveNo());
+ pickoutService.insert(pickout);
+ for (PickOutDto pickOutDto : pickOutDtosk) {
+ Mat mat = matService.selectByMatnr(hostId, pickOutDto.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ pickoutService.delete(new EntityWrapper<Pickout>()
+ .eq("id",pickout.getId()));
+ throw new CoolException("鏌ヨ涓嶅埌璇ョ墿鏂欐槑缁�");
+
+ }
+ PickoutDetl pickoutDetl = new PickoutDetl();
+ pickoutDetl.setHeadId(pickout.getId());
+ pickoutDetl.setNodeId(pickOutDto.getNodeId().longValue());
+ pickoutDetl.setNodeName(pickOutDto.getLocNo());
+ pickoutDetl.setAnfme(pickOutDto.getAnfme().doubleValue());
+ pickoutDetl.setMatnr(pickOutDto.getMatnr());
+ pickoutDetl.setMaktx(mat.getMaktx());
+ pickoutDetl.setName(mat.getName());
+ pickoutDetl.setSpecs(mat.getSpecs());
+ pickoutDetl.setModel(mat.getModel());
+ pickoutDetl.setUnit(mat.getUnit());
+ pickoutDetl.setPrice(mat.getPrice());
+ pickoutDetl.setWeight(mat.getWeight());
+ pickoutDetl.setStatus(1);
+ pickoutDetl.setCreateBy(userId.intValue());
+ pickoutDetl.setUpdateBy(userId.intValue());
+ pickoutDetl.setWrkNo(pickout.getWrkNo());
+ pickoutDetlService.insert(pickoutDetl);
}
/**
@@ -64,10 +113,6 @@
wave.setStatus((short) 1);
waveService.update(wave,new EntityWrapper<Wave>()
.eq("id",wave.getId()));
-
- /**
- * 鐢熸垚鎷ｈ揣鍗�
- */
return R.ok();
diff --git a/src/main/resources/mapper/PickoutMapper.xml b/src/main/resources/mapper/PickoutMapper.xml
index b0765dd..4961e3f 100644
--- a/src/main/resources/mapper/PickoutMapper.xml
+++ b/src/main/resources/mapper/PickoutMapper.xml
@@ -15,7 +15,13 @@
<result column="update_time" property="updateTime" />
<result column="update_by" property="updateBy" />
<result column="memo" property="memo" />
+ <result column="order_qty" property="orderQty" />
+ <result column="order_nos" property="orderNos" />
+ <result column="wave_no" property="waveNo" />
</resultMap>
+ <update id="updateWaveStatus">
+ update man_wave set status = 0 where wave_no = #{waveNo}
+ </update>
</mapper>
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index e473fef..76d7a3b 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -53,6 +53,7 @@
}
});
+
/* 琛ㄦ牸鎼滅储 */
form.on('submit(docTypeTableSearch)', function (data) {
insTb.reload({where: {doc_name: data.field.docName,doc_class:2}});
diff --git a/src/main/webapp/static/js/pickout/pickout.js b/src/main/webapp/static/js/pickout/pickout.js
index 7e54ae0..aaa9c24 100644
--- a/src/main/webapp/static/js/pickout/pickout.js
+++ b/src/main/webapp/static/js/pickout/pickout.js
@@ -34,7 +34,7 @@
defaultToolbar: [],
cols:[[
// {type: 'checkbox'}
- {field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'}
+ {field: 'wrkNo', align: 'center',title: '浠诲姟鍙�',width: 180}
,{field: 'id', align: 'center',title: '鍞竴ID',hide: true}
,{field: 'hostId', align: 'center',title: '鍟嗘埛ID', hide: true}
,{field: 'userId', align: 'center',title: '鐢ㄦ埛ID', hide: true}
@@ -47,7 +47,7 @@
,{field: 'updateBy', align: 'center',title: '', hide:true}
,{field: 'memo', align: 'center',title: '', hide:true}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:180}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
]],
done: function (res,curr,count){
$('#dictTable+.layui-table-view .layui-table-body tbody>tr:first').trigger('click');
@@ -66,10 +66,17 @@
break;
}
});
+ /* 鐩戝惉琛屽崟鍑讳簨浠� */
+ var selObj;
+ table.on('row(leftTable)', function (obj) {
+ selObj = obj;
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
+ insTb2.reload({where: {doc_type: obj.data.docId}, page: {curr: 1}});
+ });
/* 鍒犻櫎 */
function del(ids) {
- layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ layer.confirm('纭畾瑕佹挙閿�閫変腑鏁版嵁鍚楋紵', {
skin: 'layui-layer-admin',
shade: .1
}, function (i) {
@@ -100,7 +107,7 @@
tableIns = table.render({
elem: '#pickout',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/pickout/list/auth',
+ url: baseUrl+'/pickoutDetl/list/auth',
page: true,
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
@@ -108,20 +115,34 @@
cellMinWidth: 50,
cols: [[
// {type: 'checkbox'}
- {field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'}
- ,{field: 'id', align: 'center',title: '鍞竴ID'}
- ,{field: 'hostId', align: 'center',title: '鍟嗘埛ID'}
- ,{field: 'userId', align: 'center',title: '鐢ㄦ埛ID'}
+ {field: 'id', align: 'center',title: '鍞竴ID', hide:true}
+ ,{field: 'headId', align: 'center',title: '琛ㄥごID', hide:true}
+ ,{field: 'nodeId', align: 'center',title: '搴撲綅ID', hide:true}
+ ,{field: 'nodeName', align: 'center',title: '搴撲綅鍚嶇О'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'name', align: 'center',title: '鍚嶇О', hide:true}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸', hide:true}
+ ,{field: 'model', align: 'center',title: '鍨嬪彿', hide:true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', hide:true}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide:true}
+ ,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�', hide:true}
+ ,{field: 'docType', align: 'center',title: '鍗曟嵁绫诲瀷', hide:true}
+ ,{field: 'docId', align: 'center',title: '鍗曟嵁缂栧彿', hide:true}
+ ,{field: 'price', align: 'center',title: '浠锋牸', hide:true}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺', hide:true}
+ ,{field: 'status', align: 'center',title: '鐘舵��' , hide:true}
+ ,{field: 'pickStaff', align: 'center',title: '鎷ｈ揣鍛業D'}
+ ,{field: 'pickStart$', align: 'center',title: '鎷ｈ揣寮�濮嬫椂闂�'}
+ ,{field: 'pickEnd$', align: 'center',title: '鎷ｈ揣缁撴潫鏃堕棿'}
+ ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿', hide:true}
+ ,{field: 'createBy', align: 'center',title: '鍒涘缓浜哄憳ID', hide:true}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
+ ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳ID', hide:true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
- ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��' ,templet: '#wrkStsTpl' , width: 100}
- ,{field: 'zpallet', align: 'center',title: '鏉″舰鐮�' , hide:true}
- ,{field: 'createTime$', align: 'center',title: '', hide:true}
- ,{field: 'createBy', align: 'center',title: '', hide:true}
- ,{field: 'updateTime$', align: 'center',title: '', hide:true}
- ,{field: 'updateBy', align: 'center',title: '', hide:true}
- ,{field: 'memo', align: 'center',title: '', hide:true}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:180}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
]],
request: {
pageName: 'curr',
@@ -147,109 +168,109 @@
}
});
- // 鐩戝惉鎺掑簭浜嬩欢
- table.on('sort(pickout)', function (obj) {
- var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- searchData['orderByField'] = obj.field;
- searchData['orderByType'] = obj.type;
- tableIns.reload({
- where: searchData,
- page: {curr: 1}
- });
- });
-
- // 鐩戝惉澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(pickout)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id).data;
- switch(obj.event) {
- case 'addData':
- showEditModel();
- break;
- case 'deleteData':
- if (checkStatus.length === 0) {
- layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
- return;
- }
- var ids = checkStatus.map(function (d) {
- return d.id;
- });
- del(ids);
- break;
- case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
- var titles=[];
- var fields=[];
- obj.config.cols[0].map(function (col) {
- if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
- titles.push(col.title);
- fields.push(col.field);
- }
- });
- var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- exportData[this.name] = this.value;
- });
- var param = {
- 'pickout': exportData,
- 'fields': fields
- };
- $.ajax({
- url: baseUrl+"/pickout/export/auth",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify(param),
- dataType:'json',
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- success: function (res) {
- layer.closeAll();
- if (res.code === 200) {
- table.exportFile(titles,res.data,'xls');
- } else if (res.code === 403) {
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg, {icon: 2})
- }
- }
- });
- });
- break;
- }
- });
- /* 琛ㄦ牸鎼滅储 */
- form.on('submit(leftResearch)', function (data) {
- insTb.reload({where: {doc_name: data.field.docName,doc_class:2}});
- return false;
- });
-
-
- // 鎼滅储
- form.on('submit(search)', function (data) {
- pageCurr = 1;
- tableReload(false);
- });
-
- // 閲嶇疆
- form.on('submit(reset)', function (data) {
- pageCurr = 1;
- clearFormVal($('#search-box'));
- tableReload(false);
- });
-
- // 鏃堕棿閫夋嫨鍣�
- function layDateRender() {
- layDate.render({
- elem: '#createTime\\$',
- type: 'datetime'
- });
- layDate.render({
- elem: '#updateTime\\$',
- type: 'datetime'
- });
-
- }
+ // // 鐩戝惉鎺掑簭浜嬩欢
+ // table.on('sort(pickout)', function (obj) {
+ // var searchData = {};
+ // $.each($('#search-box [name]').serializeArray(), function() {
+ // searchData[this.name] = this.value;
+ // });
+ // searchData['orderByField'] = obj.field;
+ // searchData['orderByType'] = obj.type;
+ // tableIns.reload({
+ // where: searchData,
+ // page: {curr: 1}
+ // });
+ // });
+ //
+ // // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ // table.on('toolbar(pickout)', function (obj) {
+ // var checkStatus = table.checkStatus(obj.config.id).data;
+ // switch(obj.event) {
+ // case 'addData':
+ // showEditModel();
+ // break;
+ // case 'deleteData':
+ // if (checkStatus.length === 0) {
+ // layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ // return;
+ // }
+ // var ids = checkStatus.map(function (d) {
+ // return d.id;
+ // });
+ // del(ids);
+ // break;
+ // case 'exportData':
+ // layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ // var titles=[];
+ // var fields=[];
+ // obj.config.cols[0].map(function (col) {
+ // if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ // titles.push(col.title);
+ // fields.push(col.field);
+ // }
+ // });
+ // var exportData = {};
+ // $.each($('#search-box [name]').serializeArray(), function() {
+ // exportData[this.name] = this.value;
+ // });
+ // var param = {
+ // 'pickout': exportData,
+ // 'fields': fields
+ // };
+ // $.ajax({
+ // url: baseUrl+"/pickout/export/auth",
+ // headers: {'token': localStorage.getItem('token')},
+ // data: JSON.stringify(param),
+ // dataType:'json',
+ // contentType:'application/json;charset=UTF-8',
+ // method: 'POST',
+ // success: function (res) {
+ // layer.closeAll();
+ // if (res.code === 200) {
+ // table.exportFile(titles,res.data,'xls');
+ // } else if (res.code === 403) {
+ // top.location.href = baseUrl+"/";
+ // } else {
+ // layer.msg(res.msg, {icon: 2})
+ // }
+ // }
+ // });
+ // });
+ // break;
+ // }
+ // });
+ // /* 琛ㄦ牸鎼滅储 */
+ // form.on('submit(leftResearch)', function (data) {
+ // insTb.reload({where: {doc_name: data.field.docName,doc_class:2}});
+ // return false;
+ // });
+ //
+ //
+ // // 鎼滅储
+ // form.on('submit(search)', function (data) {
+ // pageCurr = 1;
+ // tableReload(false);
+ // });
+ //
+ // // 閲嶇疆
+ // form.on('submit(reset)', function (data) {
+ // pageCurr = 1;
+ // clearFormVal($('#search-box'));
+ // tableReload(false);
+ // });
+ //
+ // // 鏃堕棿閫夋嫨鍣�
+ // function layDateRender() {
+ // layDate.render({
+ // elem: '#createTime\\$',
+ // type: 'datetime'
+ // });
+ // layDate.render({
+ // elem: '#updateTime\\$',
+ // type: 'datetime'
+ // });
+ //
+ // }
layDateRender();
});
diff --git a/src/main/webapp/static/js/wave/wave.js b/src/main/webapp/static/js/wave/wave.js
index e78a5f0..1209730 100644
--- a/src/main/webapp/static/js/wave/wave.js
+++ b/src/main/webapp/static/js/wave/wave.js
@@ -181,7 +181,7 @@
}
,yes: function(index, layero){
//鎸夐挳銆愰┈涓婃嫞璐с�戠殑鍥炶皟
- stockOut(res.data);
+ stockOut(res.data,data);
}
,btn2: function(index, layero){
//鎸夐挳銆愮◢鍚庡鐞嗐�戠殑鍥炶皟
@@ -198,10 +198,10 @@
}
- function stockOut(mData){
+ function stockOut(mData, data){
console.log(mData);
- layer.confirm('纭畾鐢熸垚璇ユ尝娆＄殑鎷ｈ揣鍗曪紵', {
+ layer.confirm('纭畾鐢熸垚璇ユ尝娆＄殑鎷ｈ揣鍗曪紵(涓嶅彲閫�)', {
skin: 'layui-layer-admin',
shade: .1
}, function (i) {
diff --git a/src/main/webapp/views/pickout/pickout.html b/src/main/webapp/views/pickout/pickout.html
index 9521946..65d6893 100644
--- a/src/main/webapp/views/pickout/pickout.html
+++ b/src/main/webapp/views/pickout/pickout.html
@@ -17,19 +17,19 @@
}
/* 宸﹁〃 */
- #docTypeTable + .layui-table-view .layui-table-tool-temp {
+ #leftTable + .layui-table-view .layui-table-tool-temp {
padding-right: 0;
}
- #docTypeTable + .layui-table-view .layui-table-body tbody > tr td {
+ #leftTable + .layui-table-view .layui-table-body tbody > tr td {
cursor: pointer;
}
- #docTypeTable + .layui-table-view .layui-table-body tbody > tr.layui-table-click {
+ #leftTable + .layui-table-view .layui-table-body tbody > tr.layui-table-click {
background-color: #fff3e0;
}
- #docTypeTable + .layui-table-view .layui-table-body tbody > tr.layui-table-click td:last-child > div:before {
+ #leftTable + .layui-table-view .layui-table-body tbody > tr.layui-table-click td:last-child > div:before {
position: absolute;
right: 6px;
content: "\e602";
@@ -137,8 +137,12 @@
<script type="text/html" id="operate">
{{#if (d.wrkSts == 1||d.wrkSts == 2){ }}
+ <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="printOrder">鎵撳嵃鎷ｈ揣鍗�</a>
+ {{# } }}
+ {{#if (d.wrkSts == 3){ }}
<a class="layui-btn layui-btn-xs btn-complete" lay-event="complete">瀹屾垚</a>
{{# } }}
+
<!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>-->
{{#if (d.wrkSts == 1||d.wrkSts == 2){ }}
<a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鎾ら攢</a>
--
Gitblit v1.9.1