From 35ce7aaef10e30006bcef381d19302c0928c1194 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 14 九月 2021 08:24:00 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/waitMatchk/waitMatchk.js | 267 +++++++++++------------------
src/main/java/com/zy/ints/entity/WaitMatchk.java | 38 ---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2
src/main/java/com/zy/asrs/controller/MobileController.java | 87 ++++++++
src/main/java/com/zy/ints/controller/WaitMatchkController.java | 110 +++++++++++
src/main/webapp/views/pda/stockCheck.html | 4
src/main/webapp/views/waitMatchk/waitMatchk.html | 7
src/main/webapp/views/pda/matQuery.html | 8
src/main/webapp/views/pda/stockQuery.html | 10
9 files changed, 309 insertions(+), 224 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 361e6f3..3851b5f 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -1,30 +1,32 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.entity.CombBillQueryVo;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.WrkDetl;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.service.LocDetlService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.MobileService;
-import com.zy.asrs.service.WrkDetlService;
+import com.zy.asrs.service.*;
import com.zy.common.model.MobileLocDetlVo;
import com.zy.common.web.BaseController;
+import com.zy.ints.entity.WaitMatchk;
import com.zy.ints.entity.WaitMatin;
+import com.zy.ints.service.WaitMatchkService;
import com.zy.ints.service.WaitMatinService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -45,6 +47,10 @@
private WrkDetlService wrkDetlService;
@Autowired
private WaitMatinService waitMatinService;
+ @Autowired
+ private WaitMatchkService waitMatchkService;
+ @Autowired
+ private MatCodeService matCodeService;
/**
* 缁勬墭
@@ -200,4 +206,69 @@
return R.ok().add(list);
}
+ /**
+ * 鏍规嵁PDA鐩樼偣鏁伴噺锛屾洿鏂扮洏鐐归�氱煡妗�
+ * @param param
+ * @return
+ */
+ @RequestMapping("/stock/check")
+ @Transactional
+ public R erpStockCheck(@RequestBody String param) {
+ Boolean flag = false;
+ JSONObject jsonObject = JSONObject.parseObject(param);
+ String checkListStr = jsonObject.getString("checkList");
+ List<WaitMatchk> checkList = JSONArray.parseArray(checkListStr, WaitMatchk.class);
+ Long userId = 9527L; //getUserId();//9527L;
+ int seq = 0;
+ Date now = new Date();
+ for (Integer i = 0; i < checkList.size(); i++) {
+ String locNo = checkList.get(i).getLocNo();
+ String matNo = checkList.get(i).getMatNo();
+ Double checkQty = checkList.get(i).getCheckQty();
+
+ Wrapper<WaitMatchk> wrapper = new EntityWrapper<WaitMatchk>().eq("loc_no",locNo).eq("mat_no",matNo);
+ WaitMatchk waitMatchk0 = waitMatchkService.selectOne(wrapper);
+ if(null != waitMatchk0){
+ waitMatchk0.setCheckQty(checkQty);
+ flag = waitMatchkService.update(waitMatchk0,wrapper);
+ if(!flag){
+ throw new CoolException("鏇存柊鐩樼偣閫氱煡妗ｅけ璐�");
+ }
+ } else {
+ MatCode matCode = matCodeService.selectOne(new EntityWrapper<MatCode>().eq("mat_no",matNo));
+ WaitMatchk waitMatchk1 = waitMatchkService.selectOne(new EntityWrapper<WaitMatchk>().eq("loc_no",locNo).orderBy("seq_no",false));
+ if(null != matCode) {
+ WaitMatchk waitMatchk = new WaitMatchk();
+ waitMatchk.setLocNo(locNo);
+ waitMatchk.setMatNo(matNo);
+ if(null != waitMatchk1){
+ waitMatchk.setBillNo(waitMatchk1.getBillNo());
+ waitMatchk.setSeqNo(waitMatchk1.getSeqNo()+1);
+ waitMatchk.setZpallet(waitMatchk1.getZpallet());
+ waitMatchk.setLinkErp(waitMatchk1.getLinkErp());
+ waitMatchk.setIoStatus(waitMatchk1.getIoStatus());
+ } else {
+ waitMatchk.setBillNo("0");
+ waitMatchk.setSeqNo(seq++);
+ waitMatchk.setLinkErp(0);
+ waitMatchk.setIoStatus(1);
+ }
+ waitMatchk.setBillType(1);//鎶界洏
+ waitMatchk.setMatName(matCode.getMatName());
+ waitMatchk.setStockQty(0D);
+ waitMatchk.setCheckQty(checkQty);
+ waitMatchk.setModiTime(now);
+ waitMatchk.setModiUser(getUserId());
+ waitMatchk.setAppeTime(now);
+ waitMatchk.setAppeUser(getUserId());
+ flag = waitMatchkService.insert(waitMatchk);
+ if(!flag){
+ throw new CoolException("鏂板鐩樼偣閫氱煡妗ｆ暟鎹け璐�");
+ }
+ }
+
+ }
+ }
+ return R.ok().add(flag);
+ }
}
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 a489602..a0cef33 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -205,7 +205,7 @@
waitMatchk.setMatNo(locDetl.getMatNo());//浜у搧缂栧彿
waitMatchk.setMatName(locDetl.getMatName());//閾插钩鍚嶇О
waitMatchk.setSeqNo(i);
- waitMatchk.setIoTime(new Date());
+// waitMatchk.setIoTime(new Date());
waitMatchk.setZpallet(locDetl.getZpallet());
waitMatchk.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
waitMatchk.setAppeTime(new Date());
diff --git a/src/main/java/com/zy/ints/controller/WaitMatchkController.java b/src/main/java/com/zy/ints/controller/WaitMatchkController.java
index bd56002..81e14b2 100644
--- a/src/main/java/com/zy/ints/controller/WaitMatchkController.java
+++ b/src/main/java/com/zy/ints/controller/WaitMatchkController.java
@@ -10,22 +10,36 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.MatCode;
+import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.MatCodeService;
import com.zy.common.web.BaseController;
import com.zy.ints.entity.WaitMatchk;
+import com.zy.ints.service.WaitMatchkLogService;
import com.zy.ints.service.WaitMatchkService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
public class WaitMatchkController extends BaseController {
@Autowired
private WaitMatchkService waitMatchkService;
+ @Autowired
+ private WaitMatchkLogService waitMatchkLogService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private MatCodeService matCodeService;
//鐩樼偣閫氱煡妗�
@@ -81,15 +95,101 @@
return R.ok();
}
+ /**
+ * 鍒犻櫎鐩樼偣閫氱煡妗ｏ紝鍒犻櫎鍓嶈浆鍘嗗彶妗�
+ * @param param
+ * @return
+ */
@RequestMapping(value = "/waitMatchk/delete/auth")
@ManagerAuth
+ @Transactional
public R delete(@RequestParam String param){
List<WaitMatchk> list = JSONArray.parseArray(param, WaitMatchk.class);
if (Cools.isEmpty(list)){
return R.error();
}
for (WaitMatchk entity : list){
- waitMatchkService.delete(new EntityWrapper<>(entity));
+ boolean res = waitMatchkLogService.save(entity.getBillNo(),entity.getLocNo(),entity.getMatNo());
+ if(!res){
+ throw new CoolException("杞巻鍙叉。鍑洪敊[locNo:"+entity.getLocNo()+"],[matNo:"+entity.getMatNo()+"]");
+ }else {
+ waitMatchkService.delete(new EntityWrapper<>(entity));
+ }
+ }
+ return R.ok();
+ }
+
+ /**
+ * 瀹℃牳鐩樼偣鍗曟嵁
+ * @param param
+ * @return
+ */
+ @RequestMapping(value = "/waitMatchk/verify/auth")
+ @ManagerAuth
+ @Transactional
+ public R verify(@RequestParam String param){
+ List<WaitMatchk> list = JSONArray.parseArray(param, WaitMatchk.class);
+ if (Cools.isEmpty(list)){
+ return R.error();
+ }
+ Date now = new Date();
+ for (WaitMatchk entity : list){
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",entity.getLocNo()));
+ if(null != locMast && locMast.getLocSts().equals("F")){
+ Wrapper<LocDetl> wrapperDetl = new EntityWrapper<LocDetl>().eq("loc_no",entity.getLocNo()).eq("mat_no",entity.getMatNo());
+ LocDetl locDetl = locDetlService.selectOne(wrapperDetl);
+ if(null != locDetl) {//鏇存柊鏁伴噺锛屽垹闄ゆ槑缁�
+ if(entity.getCheckQty().equals(0)){
+ if(!locDetlService.delete(wrapperDetl)){
+ throw new CoolException("鍒犻櫎鏁伴噺涓�0鏄庣粏鍑洪敊[locNo:"+locDetl.getLocNo()+"],[matNo:"+locDetl.getMatNo()+"]");
+ }
+ }else{
+ if(!entity.getCheckQty().equals(locDetl.getQty())){ //搴撳瓨鏁伴噺涓庣洏鐐规暟閲忕浉鍚屼笉鐢ㄦ洿鏂�
+ locDetl.setQty(entity.getCheckQty());
+ if(!locDetlService.update(locDetl,wrapperDetl)){
+ throw new CoolException("鏇存柊搴撳瓨鏄庣粏鍑洪敊[locNo:"+locDetl.getLocNo()+"],[matNo:"+locDetl.getMatNo()+"]");
+ }
+ }
+
+ }
+ } else {//鎻掑叆鏄庣粏
+ LocDetl one = new LocDetl();
+ one.setLocNo(entity.getLocNo());
+ one.setMatNo(entity.getMatNo());
+ one.setQty(entity.getCheckQty());
+ one.setModiUser(getUserId());
+ one.setModiTime(now);
+ one.setAppeUser(getUserId());
+ one.setAppeTime(now);
+
+ WaitMatchk waitMatchk = waitMatchkService.selectOne(new EntityWrapper<WaitMatchk>().eq("loc_no",entity.getLocNo()));
+ if(null != waitMatchk){
+ one.setZpallet(waitMatchk.getZpallet());
+ }
+ MatCode matCode = matCodeService.selectOne(new EntityWrapper<MatCode>().eq("mat_no",entity.getMatNo()));
+ if(null != matCode) {
+ one.setMatName(matCode.getMatName());
+ one.setUnit(matCode.getUnit());
+ one.setSpecs(matCode.getSpecs());
+ one.setSize(matCode.getSize());
+ one.setColor(matCode.getColor());
+ } else {
+ throw new CoolException("鏂板鏄庣粏鐗╂枡缂栫爜涓嶅瓨鍦ㄥ嚭閿橻matNo:"+entity.getMatNo()+"]");
+ }
+
+ if(!locDetlService.insert(one)){
+ throw new CoolException("鎻掑叆搴撳瓨鏄庣粏鍑洪敊[locNo:"+entity.getLocNo()+"],[matNo:"+entity.getMatNo()+"]");
+ }
+ }
+
+ entity.setVerifyStatus(1);
+ entity.setVerifyUser(getUserId());
+ entity.setModiTime(now);
+ Wrapper<WaitMatchk> wrapper = new EntityWrapper<WaitMatchk>().eq("loc_no",entity.getLocNo()).eq("mat_no",entity.getMatNo());
+ waitMatchkService.update(entity,wrapper);
+ } else {
+ throw new CoolException("搴撲綅闈炲湪搴撶姸鎬�:" + locMast.getLocNo());
+ }
}
return R.ok();
}
diff --git a/src/main/java/com/zy/ints/entity/WaitMatchk.java b/src/main/java/com/zy/ints/entity/WaitMatchk.java
index 6322468..01686ad 100644
--- a/src/main/java/com/zy/ints/entity/WaitMatchk.java
+++ b/src/main/java/com/zy/ints/entity/WaitMatchk.java
@@ -1,44 +1,20 @@
package com.zy.ints.entity;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
+import com.core.common.SpringUtils;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.service.LocMastService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import com.core.common.SpringUtils;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import com.core.common.SpringUtils;
-import io.swagger.annotations.ApiModelProperty;
-import com.core.common.SpringUtils;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import com.core.common.SpringUtils;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@TableName("ints_wait_matchk")
public class WaitMatchk implements Serializable {
diff --git a/src/main/webapp/static/js/waitMatchk/waitMatchk.js b/src/main/webapp/static/js/waitMatchk/waitMatchk.js
index 7a8609f..23d72f3 100644
--- a/src/main/webapp/static/js/waitMatchk/waitMatchk.js
+++ b/src/main/webapp/static/js/waitMatchk/waitMatchk.js
@@ -19,11 +19,11 @@
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
+ ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�', merge:true}//,event: 'locNo', style: 'cursor:pointer'
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
,{field: 'billNo', align: 'center',title: '鍗曟嵁缂栧彿'}
,{field: 'seqNo', align: 'center',title: '搴忓彿'}
,{field: 'billType$', align: 'center',title: '鍗曟嵁绫诲瀷', hide: true}
- ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�',event: 'locNo', style: 'cursor:pointer'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鍙�'}
,{field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'}
,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О'}
@@ -61,14 +61,17 @@
}
pageCurr=curr;
limit();
- form.on('checkbox(tableCheckbox)', function (data) {
- var _index = $(data.elem).attr('table-index')||0;
- if(data.elem.checked){
- res.data[_index][data.value] = 'Y';
- }else{
- res.data[_index][data.value] = 'N';
- }
- });
+ // form.on('checkbox(tableCheckbox)', function (data) {
+ // var _index = $(data.elem).attr('table-index')||0;
+ // if(data.elem.checked){
+ // res.data[_index][data.value] = 'Y';
+ // }else{
+ // res.data[_index][data.value] = 'N';
+ // }
+ // });
+ // $('.layui-form-checkbox').css("pointer-events", "none");
+ // $('td[data-field="0').css("cursor", "pointer")
+ merge(res);//璋冪敤
}
});
@@ -100,18 +103,50 @@
var checkStatus = table.checkStatus(obj.config.id);
switch(obj.event) {
case 'addData':
- layer.open({
- type: 2,
- title: '鏂板',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- content: 'waitMatchk_detail.html',
- success: function(layero, index){
- layer.getChildFrame('#data-detail-submit-edit', index).hide();
- clearFormVal(layer.getChildFrame('#detail', index));
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ var data = checkStatus.data;
+
+ for(var i=0;i<data.length;i++){
+ if (data[i].verifyStatus === 1) {
+ layer.msg('鏁版嵁鐘舵�佸凡瀹�');
+ return;
}
- });
+ }
+
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾瀹℃牳'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/waitMatchk/verify/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {param: JSON.stringify(data)},
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
+ // layer.open({
+ // type: 2,
+ // title: '鏂板',
+ // maxmin: true,
+ // area: [top.detailWidth, top.detailHeight],
+ // content: 'waitMatchk_detail.html',
+ // success: function(layero, index){
+ // layer.getChildFrame('#data-detail-submit-edit', index).hide();
+ // clearFormVal(layer.getChildFrame('#detail', index));
+ // layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ // }
+ // });
break;
case 'deleteData':
var data = checkStatus.data;
@@ -179,6 +214,37 @@
break;
}
});
+
+ function merge(res) {
+ var data = res.data;
+ var mergeIndex = 0;//瀹氫綅闇�瑕佹坊鍔犲悎骞跺睘鎬х殑琛屾暟
+ var mark = 1; //杩欓噷娑夊強鍒扮畝鍗曠殑杩愮畻锛宮ark鏄绠楁瘡娆￠渶瑕佸悎骞剁殑鏍煎瓙鏁�
+ var columsName = ['', 'locNo\\$'];//闇�瑕佸悎骞剁殑鍒楀悕绉�
+ var columsIndex = [0, 1];//闇�瑕佸悎骞剁殑鍒楃储寮曞��
+
+ for (var k = 0; k < columsName.length; k++) { //杩欓噷寰幆鎵�鏈夎鍚堝苟鐨勫垪
+ var trArr = $(".layui-table-body>.layui-table").find("tr");//鎵�鏈夎
+ for (var i = 1; i < res.data.length; i++) { //杩欓噷寰幆琛ㄦ牸褰撳墠鐨勬暟鎹�
+ var tdCurArr = trArr.eq(i).find("td").eq(columsIndex[k]);//鑾峰彇褰撳墠琛岀殑褰撳墠鍒�
+ var tdPreArr = trArr.eq(mergeIndex).find("td").eq(columsIndex[k]);//鑾峰彇鐩稿悓鍒楃殑绗竴鍒�
+
+ if (data[i][columsName[k]] === data[i - 1][columsName[k]]) { //鍚庝竴琛岀殑鍊间笌鍓嶄竴琛岀殑鍊煎仛姣旇緝锛岀浉鍚屽氨闇�瑕佸悎骞�
+ mark += 1;
+ tdPreArr.each(function () {//鐩稿悓鍒楃殑绗竴鍒楀鍔爎owspan灞炴��
+ $(this).attr("rowspan", mark);
+ });
+ tdCurArr.each(function () {//褰撳墠琛岄殣钘�
+ $(this).css("display", "none");
+ });
+ } else {
+ mergeIndex = i;
+ mark = 1;//涓�鏃﹀墠鍚庝袱琛岀殑鍊间笉涓�鏍蜂簡锛岄偅涔堥渶瑕佸悎骞剁殑鏍煎瓙鏁癿ark灏遍渶瑕侀噸鏂拌绠�
+ }
+ }
+ mergeIndex = 0;
+ mark = 1;
+ }
+ }
/* 寮圭獥 - 鏂板銆佷慨鏀� */
function showEditModel(mData) {
@@ -288,151 +354,6 @@
}
});
break;
- case 'locNo':
- var param = top.reObject(data).locNo;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '搴撲綅鍙疯鎯�',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: '../locMast/locMast_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/locMast/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
- case 'verifyUser':
- var param = top.reObject(data).verifyUser;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '瀹℃牳浜哄憳璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: '../user/user_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/user/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
- case 'modiUser':
- var param = top.reObject(data).modiUser;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '淇敼浜哄憳璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: '../user/user_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/user/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
- case 'appeUser':
- var param = top.reObject(data).appeUser;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '寤烘。浜哄憳璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: '../user/user_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/user/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
-
}
});
@@ -538,6 +459,20 @@
});
+// var b = true;
+// $(function(){
+// $(document.body).on('click','td[data-field="0"]',function(){
+// var locNo = $(this).next().children("div").html();
+// if (b) {
+// b = false;
+// $("tr td[data-field=locNo\\$] div:contains("+ locNo +")").parent().prev().children().children("div").click();
+// setTimeout(function () {
+// b = true;
+// }, 200)
+// }
+// });
+// })
+
// 鍏抽棴鍔ㄤ綔
$(document).on('click','#data-detail-close', function () {
parent.layer.closeAll();
@@ -568,6 +503,8 @@
pageCurr -= 1;
}
limit(child);
+ // $('.layui-form-checkbox').css("pointer-events", "none");
+ // $('td[data-field="0').css("cursor", "pointer")
}
});
}
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 677bf14..2ab8c70 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -86,11 +86,11 @@
</div>
<div class="form-item">
<span>瑙勬牸鍨嬪彿</span>
- <input id="str2" type="text" disabled="disabled">
+ <input id="specs" type="text" disabled="disabled">
</div>
<div class="form-item">
<span>鍗曚綅</span>
- <input id="str1" type="text" disabled="disabled">
+ <input id="unit" type="text" disabled="disabled">
</div>
<div class="form-item">
<span style="vertical-align: middle">鏁伴噺</span>
@@ -125,8 +125,8 @@
if (res.code === 200) {
if (res.data != null) {
$('#matName').val(res.data.matName);
- $('#str1').val(res.data.str1);
- $('#str2').val(res.data.str2);
+ $('#specs').val(res.data.specs);
+ $('#unit').val(res.data.unit);
countDom.val(initMatCount);
$('#count').focus().select();
}
diff --git a/src/main/webapp/views/pda/stockCheck.html b/src/main/webapp/views/pda/stockCheck.html
index 43fea09..a0f7a2b 100644
--- a/src/main/webapp/views/pda/stockCheck.html
+++ b/src/main/webapp/views/pda/stockCheck.html
@@ -419,7 +419,7 @@
checkList.push({
locNo: item.locNo,
matNo: item.matNo,
- count: item.count
+ checkQty: item.count
});
});
}
@@ -440,7 +440,7 @@
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
checkList: checkList,
- sourceList: sourceList,
+ // sourceList: sourceList,
}),
contentType:'application/json;charset=UTF-8',
method: 'POST',
diff --git a/src/main/webapp/views/pda/stockQuery.html b/src/main/webapp/views/pda/stockQuery.html
index e1dadb2..34c9a2e 100644
--- a/src/main/webapp/views/pda/stockQuery.html
+++ b/src/main/webapp/views/pda/stockQuery.html
@@ -108,11 +108,11 @@
limit: 500,
cellMinWidth: 50,
cols: [[
- {field: 'matnr', align: 'center', title: '缂栫爜', event: 'detail'},
- {field: 'maktx', align: 'center', title: '鍚嶇О', event: 'detail'},
- {field: 'locNo', align: 'center', title: '搴撲綅', event: 'detail'},
- {field: 'count', align: 'center', title: '鏁伴噺', event: 'detail', style:'color: blue', width:50},
- {field: 'pickNum', align: 'center', title: '鎷ｆ枡', event: 'detail', width:50},
+ {field: 'matNo', align: 'center', title: '缂栫爜', event: 'detail'}
+ ,{field: 'matName', align: 'center', title: '鍚嶇О', event: 'detail'}
+ ,{field: 'locNo', align: 'center', title: '搴撲綅', event: 'detail'}
+ ,{field: 'count', align: 'center', title: '鏁伴噺', event: 'detail', style:'color: blue', width:50}
+ // ,{field: 'pickNum', align: 'center', title: '鎷ｆ枡', event: 'detail', width:50}
]],
done: function (res, curr, count) {
}
diff --git a/src/main/webapp/views/waitMatchk/waitMatchk.html b/src/main/webapp/views/waitMatchk/waitMatchk.html
index e088e34..39adbe6 100644
--- a/src/main/webapp/views/waitMatchk/waitMatchk.html
+++ b/src/main/webapp/views/waitMatchk/waitMatchk.html
@@ -66,9 +66,10 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
-<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
-<!-- <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</button>
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">瀹℃牳</button>
+ <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" >瀵煎嚭</button>
+<!-- style="margin-top: 10px"-->
</div>
</script>
--
Gitblit v1.9.1