From 34718ece041e3ca5f424951439a8c4662aa58401 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 14 七月 2021 15:56:04 +0800
Subject: [PATCH] 出库通知档新增紧急状态字段（0无，1紧急），wcs调用优先生成工作档
---
src/main/resources/spring-mvc.xml | 1
src/main/webapp/jsFiles/waitPakOut.js | 1163 +++++++++++++++++++++++++++-------------------------
src/main/java/com/slcf/service/WaitPakOutService.java | 5
version/20210714/新增字段 | 3
src/main/java/com/slcf/service/impl/WaitPakOutServiceImpl.java | 9
src/main/java/com/slcf/controller/param/SetEmsParam.java | 31 +
src/main/java/com/slcf/controller/WaitPakOutController.java | 33 +
src/main/webapp/WEB-INF/pages/waitPakOut.jsp | 1
src/main/java/com/slcf/dao/WaitPakOutDao.java | 4
src/main/java/com/slcf/pojo/WaitPakOutBean.java | 10
src/main/resources/mapper/WaitPakOutMapper.xml | 8
11 files changed, 706 insertions(+), 562 deletions(-)
diff --git a/src/main/java/com/slcf/controller/WaitPakOutController.java b/src/main/java/com/slcf/controller/WaitPakOutController.java
index 350b0db..f0c22d2 100644
--- a/src/main/java/com/slcf/controller/WaitPakOutController.java
+++ b/src/main/java/com/slcf/controller/WaitPakOutController.java
@@ -12,11 +12,10 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.slcf.controller.param.SetEmsParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import com.slcf.pojo.UserBean;
import com.slcf.bean.WaitPakOutCondition;
@@ -159,6 +158,34 @@
}
/**
+ * 鍑哄簱閫氱煡妗ｈ缃换鍔′负绱ф�ョ姸鎬�
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/waitPakOutSetEms.action", produces = "text/html; charset=UTF-8")
+ public String syncStocksFromSap(@RequestBody List<SetEmsParam> list) throws Exception {
+ Integer i = 0;
+ String errorTxt = "";
+ if (list.size() > 0) {
+ // 鍒ゆ柇绱ф�ヤ换鍔℃暟閲忔槸鍚﹀凡缁忚秴杩�3涓紝瓒呭嚭3涓笉鍏佽缁х画鏂板绱ф�ヤ换鍔�
+ Integer emsNum = waitPakOutService.countEmsNum();
+ if (emsNum < 3) {
+ // 璁剧疆浠诲姟涓虹揣鎬ョ姸鎬�
+ for (SetEmsParam item : list) {
+ if (waitPakOutService.waitPakOutSetEms(item) > 0) {
+ i++;
+ }
+ }
+ } else {
+ errorTxt = "绱ф�ヤ换鍔″凡瓒呭嚭3涓紝璇疯�愬績绛夊緟浠诲姟瀹屾垚";
+ }
+ } else {
+ throw new Error("鏁版嵁寮傚父");
+ }
+ return (i == 0) ? errorTxt : i.toString();
+ }
+
+ /**
* 楠岃瘉鐗╂枡缂栧彿鏄惁瀛樺湪
* @param did
* @return
diff --git a/src/main/java/com/slcf/controller/param/SetEmsParam.java b/src/main/java/com/slcf/controller/param/SetEmsParam.java
new file mode 100644
index 0000000..50021c4
--- /dev/null
+++ b/src/main/java/com/slcf/controller/param/SetEmsParam.java
@@ -0,0 +1,31 @@
+package com.slcf.controller.param;
+
+public class SetEmsParam {
+ private String lgnum; //浠撳簱鍙�
+ private int tanum; //杞偍璇锋眰缂栧彿
+ private int tapos; //琛岄」鐩�
+
+ public String getLgnum() {
+ return lgnum;
+ }
+
+ public void setLgnum(String lgnum) {
+ this.lgnum = lgnum;
+ }
+
+ public int getTanum() {
+ return tanum;
+ }
+
+ public void setTanum(int tanum) {
+ this.tanum = tanum;
+ }
+
+ public int getTapos() {
+ return tapos;
+ }
+
+ public void setTapos(int tapos) {
+ this.tapos = tapos;
+ }
+}
diff --git a/src/main/java/com/slcf/dao/WaitPakOutDao.java b/src/main/java/com/slcf/dao/WaitPakOutDao.java
index 90dfb5c..b5f1d3c 100644
--- a/src/main/java/com/slcf/dao/WaitPakOutDao.java
+++ b/src/main/java/com/slcf/dao/WaitPakOutDao.java
@@ -31,6 +31,10 @@
// @Select("select top (#{epage}) a.*,b.loc_desc loc_sts_name from cust_wait_pakout a,asr_bas_loc_type b where a.loc_sts=b.loc_sts and loc_no not in "
// + " (select top (#{spage}) loc_no from cust_wait_pakout order by loc_no asc) order by loc_no asc")
public List<WaitPakOutBean> queryWaitPakOutList(WaitPakOutCondition waitPakOutCon);
+
+ public Integer waitPakOutSetEms(@Param("lgnum") String lgnum, @Param("tanum") int tanum, @Param("tapos") int tapos);
+
+ public Integer countEmsNum();
// //缁熻鎵�鏈夋暟鎹�绘暟閲�
// @Select("select count(*) from cust_wait_pakout")
diff --git a/src/main/java/com/slcf/pojo/WaitPakOutBean.java b/src/main/java/com/slcf/pojo/WaitPakOutBean.java
index 85cc439..473da0d 100644
--- a/src/main/java/com/slcf/pojo/WaitPakOutBean.java
+++ b/src/main/java/com/slcf/pojo/WaitPakOutBean.java
@@ -22,6 +22,7 @@
private String bname; //鐢ㄦ埛ID
private int action; //0.榛樿 1.鍗曠嫭纭 2.鍗曠嫭鎵撳嵃 3.鏃㈡墦鍗板張纭
private int prnstatus; //0榛樿,1闇�瑕佹墦鍗�,2鎵撳嵃瀹屾垚,3鎵撳嵃閿欒
+ private int ems_status; // 鏄惁绱ф��
private String sheet_no; //鍗曞彿
private String mat_no; //鐗╂枡缂栫爜
@@ -619,5 +620,12 @@
public void setDate1(String date1) {
this.date1 = date1;
}
-
+
+ public int getEms_status() {
+ return ems_status;
+ }
+
+ public void setEms_status(int ems_status) {
+ this.ems_status = ems_status;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/slcf/service/WaitPakOutService.java b/src/main/java/com/slcf/service/WaitPakOutService.java
index a49f036..73f5d6d 100644
--- a/src/main/java/com/slcf/service/WaitPakOutService.java
+++ b/src/main/java/com/slcf/service/WaitPakOutService.java
@@ -4,6 +4,7 @@
import java.util.Map;
import com.slcf.bean.WaitPakOutCondition;
+import com.slcf.controller.param.SetEmsParam;
import com.slcf.pojo.WaitPakOutBean;
/**
@@ -18,6 +19,10 @@
//鏌ヨ鎵�鏈�
public Map<String,Object> queryWaitPakOutList(WaitPakOutCondition waitPakOutCon);
+
+ public Integer waitPakOutSetEms(SetEmsParam waitPakOutCon);
+
+ public Integer countEmsNum();
//鏍规嵁id鏌ヨ
public WaitPakOutBean queryWaitPakOutById(String sheet_no,String mat_no);
diff --git a/src/main/java/com/slcf/service/impl/WaitPakOutServiceImpl.java b/src/main/java/com/slcf/service/impl/WaitPakOutServiceImpl.java
index bce7321..14a824e 100644
--- a/src/main/java/com/slcf/service/impl/WaitPakOutServiceImpl.java
+++ b/src/main/java/com/slcf/service/impl/WaitPakOutServiceImpl.java
@@ -4,6 +4,7 @@
import java.util.List;
import java.util.Map;
+import com.slcf.controller.param.SetEmsParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -80,6 +81,14 @@
// }
// }
+ public Integer waitPakOutSetEms(SetEmsParam setEmsParam) {
+ return WaitPakOutDao.waitPakOutSetEms(setEmsParam.getLgnum(), setEmsParam.getTanum(), setEmsParam.getTapos());
+ }
+
+ public Integer countEmsNum() {
+ return WaitPakOutDao.countEmsNum();
+ }
+
/**
* 鏍规嵁id鏌ユ壘
*/
diff --git a/src/main/resources/mapper/WaitPakOutMapper.xml b/src/main/resources/mapper/WaitPakOutMapper.xml
index 65dc579..4b6b815 100644
--- a/src/main/resources/mapper/WaitPakOutMapper.xml
+++ b/src/main/resources/mapper/WaitPakOutMapper.xml
@@ -38,6 +38,14 @@
</where>
</select>
+<update id="waitPakOutSetEms">
+ update cust_wait_pakout set ems_status = 1 where lgnum=#{lgnum} and tanum = #{tanum} and tapos = #{tapos}
+</update>
+
+<select id="countEmsNum" resultType="integer">
+ select count(*) from cust_wait_pakout where ems_status = 1
+</select>
+
<select id="getWaitPakOutCount" parameterType="com.slcf.bean.WaitPakOutCondition" resultType="Integer">
select count(1) from cust_wait_pakout a
<where>
diff --git a/src/main/resources/spring-mvc.xml b/src/main/resources/spring-mvc.xml
index 94d1011..fd67579 100644
--- a/src/main/resources/spring-mvc.xml
+++ b/src/main/resources/spring-mvc.xml
@@ -16,6 +16,7 @@
<!-- <mvc:annotation-driven /> -->
<mvc:annotation-driven>
<mvc:message-converters>
+ <bean class="org.springframework.http.converter.StringHttpMessageConverter" /> <!--鍏堣繘琛宻tring杞崲-->
<bean
class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
<property name="supportedMediaTypes">
diff --git a/src/main/webapp/WEB-INF/pages/waitPakOut.jsp b/src/main/webapp/WEB-INF/pages/waitPakOut.jsp
index d171a62..ff0c936 100644
--- a/src/main/webapp/WEB-INF/pages/waitPakOut.jsp
+++ b/src/main/webapp/WEB-INF/pages/waitPakOut.jsp
@@ -64,6 +64,7 @@
<div class="table-responsive">
<!-- <div style="overflow:scroll;"> -->
<!-- <table id="test-table" class="table table-hover table-striped table-condensed table-bordered"></table> -->
+ <button type="button" onclick="emsBtn()" class="btn btn-danger">绱ф��</button>
<table id="test-table" class="table table-hover text-nowrap"></table>
</div>
diff --git a/src/main/webapp/jsFiles/waitPakOut.js b/src/main/webapp/jsFiles/waitPakOut.js
index 9e98818..31e9bba 100644
--- a/src/main/webapp/jsFiles/waitPakOut.js
+++ b/src/main/webapp/jsFiles/waitPakOut.js
@@ -1,310 +1,323 @@
/**
* 鍑哄簱閫氱煡妗�
*/
-var myColumns=[];
-$(function(){
- getColumns();
-
- $('#test-table').bootstrapTable('destroy');
- $('#test-table').bootstrapTable({
- method : 'GET',
- url: "work/waitPakOutList.action",
- cache : false,
- striped : true,
- pagination : true, //鍦ㄨ〃鏍煎簳閮ㄦ樉绀哄垎椤靛伐鍏锋爮
- pageSize : 10, //榛樿姣忛〉鏉℃暟
- pageNumber : 1, //榛樿鍒嗛〉
- pageList : [5,10,20,50,100],//鍒嗛〉鏁�
- showColumns : true, //鏄剧ず闅愯棌鍒�
- showRefresh : false, //鏄剧ず鍒锋柊鎸夐挳
- showExport : false,
- toolbar:"#toolbar",
- singleselect : true,
- clickToSelect: true, // 鍗曞嚮琛屽嵆鍙互閫変腑
- search : false,//鏄剧ず鎼滅礌琛ㄥ崟
- silent : true, //鍒锋柊浜嬩欢蹇呴』璁剧疆
- sidePagination : "server", //琛ㄧず鏈嶅姟绔姹�
- columns : //myColumns,
- [{
- checkbox:true
- },{
- field : "lgnum",
- title : "浠撳簱鍙�",
+var myColumns = [];
+$(function () {
+ getColumns();
+
+ $('#test-table').bootstrapTable('destroy');
+ $('#test-table').bootstrapTable({
+ method: 'GET',
+ url: "work/waitPakOutList.action",
+ cache: false,
+ striped: true,
+ pagination: true, //鍦ㄨ〃鏍煎簳閮ㄦ樉绀哄垎椤靛伐鍏锋爮
+ pageSize: 10, //榛樿姣忛〉鏉℃暟
+ pageNumber: 1, //榛樿鍒嗛〉
+ pageList: [5, 10, 20, 50, 100],//鍒嗛〉鏁�
+ showColumns: true, //鏄剧ず闅愯棌鍒�
+ showRefresh: false, //鏄剧ず鍒锋柊鎸夐挳
+ showExport: false,
+ toolbar: "#toolbar",
+ singleSelect : true,
+ clickToSelect: true, // 鍗曞嚮琛屽嵆鍙互閫変腑
+ search: false,//鏄剧ず鎼滅礌琛ㄥ崟
+ silent: true, //鍒锋柊浜嬩欢蹇呴』璁剧疆
+ sidePagination: "server", //琛ㄧず鏈嶅姟绔姹�
+ columns: //myColumns,
+ [{
+ checkbox: true
+ }, {
+ field: "lgnum",
+ title: "浠撳簱鍙�",
// class : 'col-md-2',
- align : "center",
- valign : "middle",
- sortable : "true"
- }, {
- field : "tanum",
- title : "杞偍缂栧彿",
- align : "center",
- valign : "middle",
- }, {
- field : "tapos",
- title : "琛岄」鐩�",
- align : "center",
- valign : "middle",
- }, {
- field : "matnr",
- title : "鐗╂枡",
- align : "left",
- valign : "middle",
- sortable : "true"
- }, {
- field : "maktx",
- title : "鐗╂枡鎻忚堪",
- align : "center",
- valign : "middle",
- sortable : "true"
- }, {
- field : "werks",
- title : "宸ュ巶",
- align : "center",
- valign : "middle",
- sortable : "true"//,
+ align: "center",
+ valign: "middle",
+ sortable: "true"
+ }, {
+ field: "tanum",
+ title: "杞偍缂栧彿",
+ align: "center",
+ valign: "middle",
+ }, {
+ field: "tapos",
+ title: "琛岄」鐩�",
+ align: "center",
+ valign: "middle",
+ }, {
+ field: "matnr",
+ title: "鐗╂枡",
+ align: "left",
+ valign: "middle",
+ sortable: "true"
+ }, {
+ field: "maktx",
+ title: "鐗╂枡鎻忚堪",
+ align: "center",
+ valign: "middle",
+ sortable: "true"
+ }, {
+ field: "werks",
+ title: "宸ュ巶",
+ align: "center",
+ valign: "middle",
+ sortable: "true"//,
// visible : false
- }, {
- field : "vsolm",
- title : "鏁伴噺",
- align : "center",
- valign : "middle",
- sortable : "true"
- }, {
- field : "meins",
- title : "鍗曚綅",
- align : "center",
- valign : "middle",
- sortable : "true"
- }, {
- field : "vltyp",
- title : "婧愬彂鍦扮被鍨�",
- align : "center",
- valign : "middle",
- sortable : "true"
- }, {
- field : "vlpla",
- title : "婧愬彂鍦颁粨浣�",
- align : "center",
- valign : "middle",
- sortable : "true"
- }, {
- field : "nltyp",
- title : "鐩殑鍦扮被鍨�",
- align : "center",
- valign : "middle",
- sortable : "true"
- }, {
- field : "nlpla",
- title : "鐩殑鍦颁粨浣�",
- align : "center",
- valign : "middle",
- sortable : "true"
- }, {
- field : "bname",
- title : "鐢ㄦ埛ID",
- align : "center",
- valign : "middle",
- sortable : "true"
- }, {
- field : "memo",
- title : "澶囨敞",
- align : "center",
- valign : "middle",
- sortable : "true",
- visible : false
- }, {
- field : "status",
- title : "璧勬枡鐘舵��",
- align : "center",
- valign : "middle",
- sortable : "true",
- formatter : function(value, row, index) {
- if(value=='N'){
- return '鏈鐞�';
- }else if(value=='Y'){
- return '鍑哄簱涓�';
- }else if(value=='X'){
- return '浠诲姟寮傚父';
- }
- }
- }, {
- field : "io_status",
- title : "瀹屾垚鐘舵��",
- align : "center",
- valign : "middle",
- sortable : "true",
- formatter : function(value, row, index) {
- if(value=='N'){
- return '鏈畬鎴�';
- }else if(value=='Y'){
- return '鍑哄簱瀹屾垚';
- }else if(value=='X'){
- return '鍥炴姤寮傚父';
- }
- }
- }, {
- field : "modi_user",
- title : "淇敼浜哄憳",
- align : "center",
- valign : "middle",
- visible : false,
- sortable : "true"
- }, {
- field : "modi_time",
- title : "淇敼鏃堕棿",
- align : "center",
- valign : "middle",
- visible : false,
- sortable : "true"
- }, {
- field: 'operate',
- title: '鎿嶄綔',
- class : 'col-md-2',
- align: 'center',
- valign: 'middle',
- formatter: operateFormatter,
- }],
- queryParamsType: "undefined",
+ }, {
+ field: "vsolm",
+ title: "鏁伴噺",
+ align: "center",
+ valign: "middle",
+ sortable: "true"
+ }, {
+ field: "meins",
+ title: "鍗曚綅",
+ align: "center",
+ valign: "middle",
+ sortable: "true"
+ }, {
+ field: "vltyp",
+ title: "婧愬彂鍦扮被鍨�",
+ align: "center",
+ valign: "middle",
+ sortable: "true"
+ }, {
+ field: "vlpla",
+ title: "婧愬彂鍦颁粨浣�",
+ align: "center",
+ valign: "middle",
+ sortable: "true"
+ }, {
+ field: "nltyp",
+ title: "鐩殑鍦扮被鍨�",
+ align: "center",
+ valign: "middle",
+ sortable: "true"
+ }, {
+ field: "nlpla",
+ title: "鐩殑鍦颁粨浣�",
+ align: "center",
+ valign: "middle",
+ sortable: "true"
+ }, {
+ field: "bname",
+ title: "鐢ㄦ埛ID",
+ align: "center",
+ valign: "middle",
+ sortable: "true"
+ }, {
+ field: "memo",
+ title: "澶囨敞",
+ align: "center",
+ valign: "middle",
+ sortable: "true",
+ visible: false
+ }, {
+ field: "status",
+ title: "璧勬枡鐘舵��",
+ align: "center",
+ valign: "middle",
+ sortable: "true",
+ formatter: function (value, row, index) {
+ if (value == 'N') {
+ return '鏈鐞�';
+ } else if (value == 'Y') {
+ return '鍑哄簱涓�';
+ } else if (value == 'X') {
+ return '浠诲姟寮傚父';
+ }
+ }
+ }, {
+ field: "io_status",
+ title: "瀹屾垚鐘舵��",
+ align: "center",
+ valign: "middle",
+ sortable: "true",
+ formatter: function (value, row, index) {
+ if (value == 'N') {
+ return '鏈畬鎴�';
+ } else if (value == 'Y') {
+ return '鍑哄簱瀹屾垚';
+ } else if (value == 'X') {
+ return '鍥炴姤寮傚父';
+ }
+ }
+ }, {
+ field: "ems_status",
+ title: "绱ф�ョ姸鎬�",
+ align: "center",
+ valign: "middle",
+ sortable: "true",
+ formatter: function (value, row, index) {
+ if (value == 0) {
+ return '鏃�';
+ } else if (value == 1) {
+ return '<span style="color: red">绱ф��</span>';
+ }
+ }
+ }, {
+ field: "modi_user",
+ title: "淇敼浜哄憳",
+ align: "center",
+ valign: "middle",
+ visible: false,
+ sortable: "true"
+ }, {
+ field: "modi_time",
+ title: "淇敼鏃堕棿",
+ align: "center",
+ valign: "middle",
+ visible: false,
+ sortable: "true"
+ }, {
+ field: 'operate',
+ title: '鎿嶄綔',
+ class: 'col-md-2',
+ align: 'center',
+ valign: 'middle',
+ formatter: operateFormatter,
+ }],
+ queryParamsType: "undefined",
queryParams: function queryParams(params) { //璁剧疆鏌ヨ鍙傛暟
var param = {
pageNumber: params.pageNumber,
pageSize: params.pageSize,
- matnr:$("#search_sheet_no").val(),
- vlpla:$("#loc_no").val(),
- maktx:$("#search_mat_no").val()
+ matnr: $("#search_sheet_no").val(),
+ vlpla: $("#loc_no").val(),
+ maktx: $("#search_mat_no").val()
// searchText: params.searchText
};
return param;
},
- formatLoadingMessage : function() {
- return "璇风◢绛夛紝姝ｅ湪鍔犺浇涓�...";
- },
+ formatLoadingMessage: function () {
+ return "璇风◢绛夛紝姝ｅ湪鍔犺浇涓�...";
+ },
- formatNoMatches : function() {
- return '鏃犵鍚堟潯浠剁殑璁板綍';
- },
- //娉ㄥ唽鍔犺浇瀛愯〃鐨勪簨浠躲�傛敞鎰忎笅杩欓噷鐨勪笁涓弬鏁帮紒
- onExpandRow: function (index, row, $detail) {
+ formatNoMatches: function () {
+ return '鏃犵鍚堟潯浠剁殑璁板綍';
+ },
+ //娉ㄥ唽鍔犺浇瀛愯〃鐨勪簨浠躲�傛敞鎰忎笅杩欓噷鐨勪笁涓弬鏁帮紒
+ onExpandRow: function (index, row, $detail) {
oInit.InitSubTable(index, row, $detail);
},
- onCheck:function(row){
- getNetACount();
+ onCheck: function (row) {
+ getNetACount();
// alert(row.menu_name);
- },onUncheck:function(row){
- getNetACount();
+ }, onUncheck: function (row) {
+ getNetACount();
// alert('鍙栨秷閫変腑');
- },onCheckAll:function(){
- getNetACount();
- },onUncheckAll:function(){
- getNetACount();
+ }, onCheckAll: function () {
+ getNetACount();
+ }, onUncheckAll: function () {
+ getNetACount();
},
- onClickRow:function (row,$element) {
+ onClickRow: function (row, $element) {
$('.info').removeClass('info');
$($element).addClass('info');
}
- });
-});
+ });
+});
function operateFormatter(value, row, index) {
- return [
+ return [
// '<button type="button" style="display:'+updateEnable+'" class=" btn btn-info" onclick="overWaitPakOut(\''+row.lgnum+'\',\''+row.tanum+'\',\''+row.tapos+'\')">瀹屾垚</button>',
- ' <button style="display:'+deleteEnable+'" class=" btn btn-danger" type="button" onclick="delWaitPakOut(\''+row.lgnum+'\',\''+row.tanum+'\',\''+row.tapos+'\')">鍒犻櫎</button>'
- ].join('');
+ ' <button style="display:' + deleteEnable + '" class=" btn btn-danger" type="button" onclick="delWaitPakOut(\'' + row.lgnum + '\',\'' + row.tanum + '\',\'' + row.tapos + '\')">鍒犻櫎</button>'
+ ].join('');
}
function getColumns() {
- myColumns=[];
- // 鍔犺浇鍔ㄦ�佽〃鏍�
- $.ajax({
- url : $("#PageContext").val() + "/matColumn.json",
- type : 'get',
- dataType : "json",
- async : false,
- success : function(returnValue) {
- // 鏈煡璇㈠埌鐩稿簲鐨勫垪锛屽睍绀洪粯璁ゅ垪
- if (returnValue.retCode == "0") {
- //娌℃煡鍒板垪鐨勬椂鍊欐妸涔嬪墠鐨勫垪鍐嶇粰瀹�
- myColumns = $table.bootstrapTable('getOptions').columns[0];
- } else {
- // 寮傛鑾峰彇瑕佸姩鎬佺敓鎴愮殑鍒�
- myColumns.push({
- checkbox:true,
- align : "center",
- valign : "middle"
- });
- myColumns.push({
- title: '搴�',
- field: '',
- formatter: function (value, row, index) {
- return index+1;
- }
- });
- myColumns.push({
- field : "sheet_no",
- title : "鍗曞彿",
- class : 'col-md-1',
- align : "center",
- valign : "middle",
- sortable : "true"
- });
- myColumns.push({
- field : "loc_no",
- title : "搴撲綅",
- align : "left",
- valign : "middle"
- });
- myColumns.push({
- field : "io_status",
- title : "鐘舵��",
- align : "left",
- valign : "middle",
- formatter : function(value, row, index) {
- if (value=='1'){
- return '鍑嗗涓�';
- }else if (value=='2'){
- return "<font color='blue'>鍑哄簱涓�</font>";
- }else if (value=='3'){
- return "<font color='red'>瀹屾垚</font>";
- }
- }
- });
- myColumns.push({
- field : "ctns",
- title : "浼樺厛绾�",
- align : "left",
- valign : "middle"
- });
- var arr = returnValue.data;
- $.each(arr, function(i, item) {
+ myColumns = [];
+ // 鍔犺浇鍔ㄦ�佽〃鏍�
+ $.ajax({
+ url: $("#PageContext").val() + "/matColumn.json",
+ type: 'get',
+ dataType: "json",
+ async: false,
+ success: function (returnValue) {
+ // 鏈煡璇㈠埌鐩稿簲鐨勫垪锛屽睍绀洪粯璁ゅ垪
+ if (returnValue.retCode == "0") {
+ //娌℃煡鍒板垪鐨勬椂鍊欐妸涔嬪墠鐨勫垪鍐嶇粰瀹�
+ myColumns = $table.bootstrapTable('getOptions').columns[0];
+ } else {
+ // 寮傛鑾峰彇瑕佸姩鎬佺敓鎴愮殑鍒�
+ myColumns.push({
+ checkbox: true,
+ align: "center",
+ valign: "middle"
+ });
+ myColumns.push({
+ title: '搴�',
+ field: '',
+ formatter: function (value, row, index) {
+ return index + 1;
+ }
+ });
+ myColumns.push({
+ field: "sheet_no",
+ title: "鍗曞彿",
+ class: 'col-md-1',
+ align: "center",
+ valign: "middle",
+ sortable: "true"
+ });
+ myColumns.push({
+ field: "loc_no",
+ title: "搴撲綅",
+ align: "left",
+ valign: "middle"
+ });
+ myColumns.push({
+ field: "io_status",
+ title: "鐘舵��",
+ align: "left",
+ valign: "middle",
+ formatter: function (value, row, index) {
+ if (value == '1') {
+ return '鍑嗗涓�';
+ } else if (value == '2') {
+ return "<font color='blue'>鍑哄簱涓�</font>";
+ } else if (value == '3') {
+ return "<font color='red'>瀹屾垚</font>";
+ }
+ }
+ });
+ myColumns.push({
+ field: "ctns",
+ title: "浼樺厛绾�",
+ align: "left",
+ valign: "middle"
+ });
+ var arr = returnValue.data;
+ $.each(arr, function (i, item) {
// alert(item.ColumnCode);
// myColumns.push(item.ColumnCode);
- myColumns.push({
- "field" : item.ColumnCode,
- "title" : item.ColumnName,
+ myColumns.push({
+ "field": item.ColumnCode,
+ "title": item.ColumnName,
// "hide" : true,
- "visible" : item.visible,
- "align" : item.align,//'center',
- "valign" : item.valign//'middle'
- });
- });
- }
+ "visible": item.visible,
+ "align": item.align,//'center',
+ "valign": item.valign//'middle'
+ });
+ });
+ }
// console.log(myColumns);
// alert(myColumns.toString());
// return myColumns;
- }
- });
+ }
+ });
}
/**
* 鏉′欢鏌ヨ搴撲綅
* @returns
*/
-function getByCon(){
+function getByCon() {
// $("#test-table").bootstrapTable('refresh');
- $("#test-table").bootstrapTable('refreshOptions',{pageNumber:1}); //鍒嗛〉鍚庨噸鏂版悳绱㈡椂锛屽垵濮嬪寲椤电爜涓�1
+ $("#test-table").bootstrapTable('refreshOptions', {pageNumber: 1}); //鍒嗛〉鍚庨噸鏂版悳绱㈡椂锛屽垵濮嬪寲椤电爜涓�1
}
-function formValidator(){
+function formValidator() {
// $("#addForm").bootstrapValidator({
// message: 'This value is not valid',
// feedbackIcons: {
@@ -366,70 +379,70 @@
}
//琛ㄥ崟楠岃瘉
-$(function(){
- formValidator();
+$(function () {
+ formValidator();
});
//娣诲姞锛屾墦寮�妯℃�佹
-function addWaitPakOut(){
+function addWaitPakOut() {
// $("#addDlg").modal('show');
// $("#loc_detail").bootstrapTable('refreshOptions',{pageNumber:1});
}
//娣诲姞鍓嶉獙璇佹槸鍚﹀敮涓�
-function checkCode(){
- var x=$("#mat_no_add").val();
- if(x!=""){
- $.ajax({
- url:'work/checkCodeOut.action',
- dataType:'json',
- type:'post',
- data:{
- did:$("#mat_no_add").val(),
- loc_no:$("#loc_no_add").val()
- },
- success:function(data){
- $("#info").text(data.msg);
- $("#mat_name_add").val(data.mat_name_add);
- },
- error:function(){
- alert("璇锋眰澶辫触");
- }
- });
- }else{
- return false;
- }
+function checkCode() {
+ var x = $("#mat_no_add").val();
+ if (x != "") {
+ $.ajax({
+ url: 'work/checkCodeOut.action',
+ dataType: 'json',
+ type: 'post',
+ data: {
+ did: $("#mat_no_add").val(),
+ loc_no: $("#loc_no_add").val()
+ },
+ success: function (data) {
+ $("#info").text(data.msg);
+ $("#mat_name_add").val(data.mat_name_add);
+ },
+ error: function () {
+ alert("璇锋眰澶辫触");
+ }
+ });
+ } else {
+ return false;
+ }
};
//鎻愪氦鎻掑叆
-function insertWaitPakOut(){
- var msg=$("#info").text();
- if(msg=="浠ｅ彿鍙敤"){
- if($("#addForm").data('bootstrapValidator').validate().isValid()){
- $.ajax({
- url:'work/addWaitPakOut.action',
- type:'post',
- dataType:'json',
- data:$("#addForm").serialize(),
- success:function(info){
- if(info>0){
- alert("娣诲姞鎴愬姛");
- }else{
- alert("娣诲姞澶辫触");
- }
- $("#test-table").bootstrapTable('refresh');
- closedlg();
- },
- error:function(){
- alert('璇锋眰澶辫触');
- }
- });
- }else{
- return false;
- }
- }else{
- alert("浠ｅ彿涓嶅彲鐢�");
- }
+function insertWaitPakOut() {
+ var msg = $("#info").text();
+ if (msg == "浠ｅ彿鍙敤") {
+ if ($("#addForm").data('bootstrapValidator').validate().isValid()) {
+ $.ajax({
+ url: 'work/addWaitPakOut.action',
+ type: 'post',
+ dataType: 'json',
+ data: $("#addForm").serialize(),
+ success: function (info) {
+ if (info > 0) {
+ alert("娣诲姞鎴愬姛");
+ } else {
+ alert("娣诲姞澶辫触");
+ }
+ $("#test-table").bootstrapTable('refresh');
+ closedlg();
+ },
+ error: function () {
+ alert('璇锋眰澶辫触');
+ }
+ });
+ } else {
+ return false;
+ }
+ } else {
+ alert("浠ｅ彿涓嶅彲鐢�");
+ }
}
/**
@@ -437,290 +450,324 @@
* @returns
*/
//function getvalue(sheet_no,mat_no){
-function getvalue(sheet_no,mat_no,out_qty){
+function getvalue(sheet_no, mat_no, out_qty) {
// if(out_qty>0){
// alert('宸叉湁鍑哄簱鏁伴噺锛屼笉鑳戒慨鏀�');
// return;
// }
- $.ajax({
- url:'work/queryWaitPakOutById.action',
- type:'post',
- dataType:'json',
- data:{sheet_no:sheet_no,mat_no:mat_no},
- success:function(data){
- $("#sheet_no").val(data.sheet_no);
- $("#mat_no").val(data.mat_no);
- $("#mat_name").val(data.mat_name);
- $("#qty").val(data.qty);
- $("#out_qty").val(data.out_qty);
- $("#memo").val(data.memo);
- },
- error:function(){
- alert("璇锋眰澶辫触");
- }
- });
- $("#mydlg").modal("show");
+ $.ajax({
+ url: 'work/queryWaitPakOutById.action',
+ type: 'post',
+ dataType: 'json',
+ data: {sheet_no: sheet_no, mat_no: mat_no},
+ success: function (data) {
+ $("#sheet_no").val(data.sheet_no);
+ $("#mat_no").val(data.mat_no);
+ $("#mat_name").val(data.mat_name);
+ $("#qty").val(data.qty);
+ $("#out_qty").val(data.out_qty);
+ $("#memo").val(data.memo);
+ },
+ error: function () {
+ alert("璇锋眰澶辫触");
+ }
+ });
+ $("#mydlg").modal("show");
}
//淇濆瓨淇敼鍐呭
-function upWaitPakOut(){
- if($("#myform").data('bootstrapValidator').validate().isValid()){
- $.ajax({
- url:'work/upWaitPakOut.action',
- type:'post',
- dataType:'json',
- data:$("#myform").serialize(),
- success:function(data){
- if(data>0){
- alert("淇敼鎴愬姛");
- }else{
- alert("淇敼澶辫触");
- }
- $("#test-table").bootstrapTable('refresh');
- closedlg();
- },
- error:function(){
- alert("璇锋眰澶辫触");
- }
- });
- }else{
- return false;
- }
+function upWaitPakOut() {
+ if ($("#myform").data('bootstrapValidator').validate().isValid()) {
+ $.ajax({
+ url: 'work/upWaitPakOut.action',
+ type: 'post',
+ dataType: 'json',
+ data: $("#myform").serialize(),
+ success: function (data) {
+ if (data > 0) {
+ alert("淇敼鎴愬姛");
+ } else {
+ alert("淇敼澶辫触");
+ }
+ $("#test-table").bootstrapTable('refresh');
+ closedlg();
+ },
+ error: function () {
+ alert("璇锋眰澶辫触");
+ }
+ });
+ } else {
+ return false;
+ }
}
/**
* 鎵嬪伐瀹岀粨鍑哄簱閫氱煡妗ｏ紝鍙嶉ERP
* @returns
*/
-function overWaitPakOut(lgnum,tanum,tapos){
- var msg = '浠撳簱鍙�:' + lgnum + '\n杞偍缂栧彿:' + tanum + '\n琛岄」鐩�:' + tapos;
- if(confirm('纭瀹岀粨璇ョ瑪閫氱煡妗ｏ紵\n' + msg)){
- $.ajax({
- url:'work/overWaitPakOut.action',
- type:'post',
- dataType:'json',
- data:{
- lgnum:lgnum,
- tanum:tanum,
- tapos:tapos
- },
- success:function(data){
- if(data>0){
- alert("瀹岀粨鎴愬姛");
- }else{
- alert("瀹岀粨澶辫触");
- }
- $("#test-table").bootstrapTable('refresh');
- closedlg();
- },
- error:function(){
- alert("璇锋眰澶辫触");
- }
- });
- }else{
- return false;
- }
+function overWaitPakOut(lgnum, tanum, tapos) {
+ var msg = '浠撳簱鍙�:' + lgnum + '\n杞偍缂栧彿:' + tanum + '\n琛岄」鐩�:' + tapos;
+ if (confirm('纭瀹岀粨璇ョ瑪閫氱煡妗ｏ紵\n' + msg)) {
+ $.ajax({
+ url: 'work/overWaitPakOut.action',
+ type: 'post',
+ dataType: 'json',
+ data: {
+ lgnum: lgnum,
+ tanum: tanum,
+ tapos: tapos
+ },
+ success: function (data) {
+ if (data > 0) {
+ alert("瀹岀粨鎴愬姛");
+ } else {
+ alert("瀹岀粨澶辫触");
+ }
+ $("#test-table").bootstrapTable('refresh');
+ closedlg();
+ },
+ error: function () {
+ alert("璇锋眰澶辫触");
+ }
+ });
+ } else {
+ return false;
+ }
}
//鍗曚釜鍒犻櫎
-function delWaitPakOut(lgnum,tanum,tapos){
- if(confirm('鎮ㄧ‘瀹氳鍒犻櫎杩欐潯鏁版嵁鍚�')){
- $.ajax({
- url:'work/delWaitPakOut.action',
- type:'post',
- dataType:'json',
- data:{
- lgnum:lgnum,
- tanum:tanum,
- tapos:tapos
- },
- success:function(data){
- if(data>0){
- alert("鍒犻櫎鎴愬姛");
- }else{
- alert("鍒犻櫎澶辫触");
- }
- $("#test-table").bootstrapTable('refresh');
- },
- error:function(){
- alert("璇锋眰澶辫触");
- }
- });
- }
+function delWaitPakOut(lgnum, tanum, tapos) {
+ if (confirm('鎮ㄧ‘瀹氳鍒犻櫎杩欐潯鏁版嵁鍚�')) {
+ $.ajax({
+ url: 'work/delWaitPakOut.action',
+ type: 'post',
+ dataType: 'json',
+ data: {
+ lgnum: lgnum,
+ tanum: tanum,
+ tapos: tapos
+ },
+ success: function (data) {
+ if (data > 0) {
+ alert("鍒犻櫎鎴愬姛");
+ } else {
+ alert("鍒犻櫎澶辫触");
+ }
+ $("#test-table").bootstrapTable('refresh');
+ },
+ error: function () {
+ alert("璇锋眰澶辫触");
+ }
+ });
+ }
}
//鍙栨秷鍑哄簱
-function cancleRetreve(){
- var idstr=[];
- var matStr=[];
- var locStr=[];
-
- var flag = true;
- //鑾峰彇閫変腑鐨勮
- var a= $('#test-table').bootstrapTable('getSelections');
- if(a.length<=0){
- alert('璇烽�夋嫨寰呭鐞嗘暟鎹�');
- return;
- }
- if(confirm('纭鍙栨秷鍑哄簱锛�')){
- $.each(a,function(index){
- if(a[index].io_status!="1"){
- flag = false;
- }
- idstr.push(a[index].sheet_no);
- matStr.push(a[index].mat_no);
- locStr.push(a[index].loc_no)
- });
- if(flag==false){
- alert('瀛樺湪鍑哄簱涓暟鎹紝涓嶈兘鍙栨秷');
- return;
- }
- $.ajax({
- url:'work/movePakOutToLog.action',
- type:'post',
- dataType:'json',
- data:{ids:idstr, matStr:matStr, locStr:locStr},
- traditional: true,
- success:function(data){
- if(data>0){
- alert("鍙栨秷鎴愬姛");
- }else{
- alert("鍙栨秷澶辫触");
- }
- $("#test-table").bootstrapTable('refresh');
- },
- error:function(){
- alert("璇锋眰澶辫触");
- }
- });
- }
+function cancleRetreve() {
+ var idstr = [];
+ var matStr = [];
+ var locStr = [];
+
+ var flag = true;
+ //鑾峰彇閫変腑鐨勮
+ var a = $('#test-table').bootstrapTable('getSelections');
+ if (a.length <= 0) {
+ alert('璇烽�夋嫨寰呭鐞嗘暟鎹�');
+ return;
+ }
+ if (confirm('纭鍙栨秷鍑哄簱锛�')) {
+ $.each(a, function (index) {
+ if (a[index].io_status != "1") {
+ flag = false;
+ }
+ idstr.push(a[index].sheet_no);
+ matStr.push(a[index].mat_no);
+ locStr.push(a[index].loc_no)
+ });
+ if (flag == false) {
+ alert('瀛樺湪鍑哄簱涓暟鎹紝涓嶈兘鍙栨秷');
+ return;
+ }
+ $.ajax({
+ url: 'work/movePakOutToLog.action',
+ type: 'post',
+ dataType: 'json',
+ data: {ids: idstr, matStr: matStr, locStr: locStr},
+ traditional: true,
+ success: function (data) {
+ if (data > 0) {
+ alert("鍙栨秷鎴愬姛");
+ } else {
+ alert("鍙栨秷澶辫触");
+ }
+ $("#test-table").bootstrapTable('refresh');
+ },
+ error: function () {
+ alert("璇锋眰澶辫触");
+ }
+ });
+ }
}
//鍏抽棴妯℃�佹
-function closedlg(){
- $("#mydlg").modal("hide");
- $("#addDlg").modal("hide");
- $("#info").text("");
- $("#infos").text("");
-
- $('#myform').data('bootstrapValidator', null);
- $("#addForm").data('bootstrapValidator',null);
- formValidator();
- //$('#mydlg').data('bootstrapValidator').resetForm(true);
- $("input[type=reset]").trigger("click");
+function closedlg() {
+ $("#mydlg").modal("hide");
+ $("#addDlg").modal("hide");
+ $("#info").text("");
+ $("#infos").text("");
+
+ $('#myform').data('bootstrapValidator', null);
+ $("#addForm").data('bootstrapValidator', null);
+ formValidator();
+ //$('#mydlg').data('bootstrapValidator').resetForm(true);
+ $("input[type=reset]").trigger("click");
}
//娣诲姞鍑哄簱鍗�
-function addPakOutData(){
- if($("#sheet_no").val()==""){
- alert('璇疯緭鍏ュ嚭搴撳崟鍙�');
- return;
- }
- var locstr=[];
- //鑾峰彇閫変腑鐨勮
- var a= $('#loc_detail').bootstrapTable('getSelections');
- if(a.length>0){
- $.each(a,function(index){
- locstr.push(a[index].loc_no+';'+a[index].mat_no);
- });
+function addPakOutData() {
+ if ($("#sheet_no").val() == "") {
+ alert('璇疯緭鍏ュ嚭搴撳崟鍙�');
+ return;
+ }
+ var locstr = [];
+ //鑾峰彇閫変腑鐨勮
+ var a = $('#loc_detail').bootstrapTable('getSelections');
+ if (a.length > 0) {
+ $.each(a, function (index) {
+ locstr.push(a[index].loc_no + ';' + a[index].mat_no);
+ });
- if(confirm("纭畾娣诲姞鍒板嚭搴撳崟?")){
+ if (confirm("纭畾娣诲姞鍒板嚭搴撳崟?")) {
// console.log(idstr);
- $.ajax({
- url:'work/addPakOutData.action',
- dataType:'json',
- type:'post',
- traditional:true,
- data:{
- sheet_no:$("#sheet_no").val().trim(),
- locstr:locstr
- },
- success:function(data){
- if(data.code==0){
- alert("娣诲姞鎴愬姛锛�" + data.msg);
- $('#test-table').bootstrapTable('refresh');
- }else{
- alert("娣诲姞澶辫触锛�" + data.msg);
- }
- },
- error:function(){
- alert("璇锋眰澶辫触锛�");
- }
- });
- }else{
- return false;
- }
- }else{
- alert("璇疯嚦灏戦�変腑涓�琛屾暟鎹�");
- }
+ $.ajax({
+ url: 'work/addPakOutData.action',
+ dataType: 'json',
+ type: 'post',
+ traditional: true,
+ data: {
+ sheet_no: $("#sheet_no").val().trim(),
+ locstr: locstr
+ },
+ success: function (data) {
+ if (data.code == 0) {
+ alert("娣诲姞鎴愬姛锛�" + data.msg);
+ $('#test-table').bootstrapTable('refresh');
+ } else {
+ alert("娣诲姞澶辫触锛�" + data.msg);
+ }
+ },
+ error: function () {
+ alert("璇锋眰澶辫触锛�");
+ }
+ });
+ } else {
+ return false;
+ }
+ } else {
+ alert("璇疯嚦灏戦�変腑涓�琛屾暟鎹�");
+ }
}
//纭鍑哄簱
-function confirmRetrieve(){
- if($("#stn_no").val()==""){
- alert('璇烽�夋嫨鍏ㄦ澘鍑哄簱绔�');
- return;
- }
+function confirmRetrieve() {
+ if ($("#stn_no").val() == "") {
+ alert('璇烽�夋嫨鍏ㄦ澘鍑哄簱绔�');
+ return;
+ }
// if($("#stn_no1").val()==""){
// alert('璇烽�夋嫨鎷ｆ枡绔�');
// return;
// }
- var idstr=[];
- var locstr=[];
+ var idstr = [];
+ var locstr = [];
// var flag = true;
- //鑾峰彇閫変腑鐨勮
- var a= $('#test-table').bootstrapTable('getSelections');
- if(a.length>0){
- $.each(a,function(index){
+ //鑾峰彇閫変腑鐨勮
+ var a = $('#test-table').bootstrapTable('getSelections');
+ if (a.length > 0) {
+ $.each(a, function (index) {
// if(a[index].retrieve_qty<=0){
// flag = false;
// return;
// }
- var temp = [];
- temp.push(a[index].loc_no);
- temp.push(a[index].mat_no);
+ var temp = [];
+ temp.push(a[index].loc_no);
+ temp.push(a[index].mat_no);
// temp.push(a[index].retrieve_qty);
- var str = temp.join(';');
- idstr.push(str);
-
+ var str = temp.join(';');
+ idstr.push(str);
+
// idstr.push(a[index].mat_no);
- if(locstr.indexOf(a[index].loc_no)<0){
- locstr.push(a[index].loc_no);
- }
- });
+ if (locstr.indexOf(a[index].loc_no) < 0) {
+ locstr.push(a[index].loc_no);
+ }
+ });
// if(flag==false){
// alert('鍑哄簱鏁伴噺蹇呴』澶т簬0');
// return;
// }
- if(confirm("纭畾鍚姩鍑哄簱?")){
- console.log(idstr);
- $.ajax({
- url:'work/confirmRetrieve.action',
- dataType:'json',
- type:'post',
- traditional:true,
- data:{
- ids:idstr,
- locstr:locstr,
- stn_no:$("#stn_no").val(),
- stn_no1:1 //$("#stn_no1").val()
- },
- success:function(data){
- if(data.code==0){
- alert("鍚姩鎴愬姛锛�" + data.msg);
- $('#test-table').bootstrapTable('refresh');
- }else{
- alert("鍚姩澶辫触锛�" + data.msg);
- }
- },
- error:function(){
- alert("璇锋眰澶辫触锛�");
- }
- });
- }else{
- return false;
- }
- }else{
- alert("璇疯嚦灏戦�変腑涓�琛屾暟鎹�");
- }
+ if (confirm("纭畾鍚姩鍑哄簱?")) {
+ console.log(idstr);
+ $.ajax({
+ url: 'work/confirmRetrieve.action',
+ dataType: 'json',
+ type: 'post',
+ traditional: true,
+ data: {
+ ids: idstr,
+ locstr: locstr,
+ stn_no: $("#stn_no").val(),
+ stn_no1: 1 //$("#stn_no1").val()
+ },
+ success: function (data) {
+ if (data.code == 0) {
+ alert("鍚姩鎴愬姛锛�" + data.msg);
+ $('#test-table').bootstrapTable('refresh');
+ } else {
+ alert("鍚姩澶辫触锛�" + data.msg);
+ }
+ },
+ error: function () {
+ alert("璇锋眰澶辫触锛�");
+ }
+ });
+ } else {
+ return false;
+ }
+ } else {
+ alert("璇疯嚦灏戦�変腑涓�琛屾暟鎹�");
+ }
+}
+
+/* 璁剧疆閫氱煡妗ｄ负绱ф�ヤ换鍔� */
+function emsBtn() {
+ // 鑾峰彇褰撳墠琛�
+ var row = $("#test-table").bootstrapTable('getSelections');
+ var paramList = [];
+ if (row.length > 0) {
+ row.map(function (item) {
+ paramList.push({
+ lgnum: item.lgnum,
+ tanum: item.tanum,
+ tapos: item.tapos,
+ })
+ });
+ }
+ if(confirm('鎮ㄧ‘瀹氳璁剧疆璇ヤ换鍔′负绱ф�ョ姸鎬佸悧')){
+ $.ajax({
+ url: 'work/waitPakOutSetEms.action',
+ type:'post',
+ dataType:'text',
+ contentType:"application/json",
+ data: JSON.stringify(paramList),
+ success: function (data) {
+ if (isNaN(Number(data))) {
+ alert(data);
+ }
+ $('#test-table').bootstrapTable('refresh');
+ },
+ error: function () {
+ alert("璇锋眰澶辫触锛�");
+ }
+ });
+ }
}
\ No newline at end of file
diff --git "a/version/20210714/\346\226\260\345\242\236\345\255\227\346\256\265" "b/version/20210714/\346\226\260\345\242\236\345\255\227\346\256\265"
new file mode 100644
index 0000000..deec575
--- /dev/null
+++ "b/version/20210714/\346\226\260\345\242\236\345\255\227\346\256\265"
@@ -0,0 +1,3 @@
+alter table cust_wait_pakout add ems_status int default 0
+// 鎶婂巻鍙叉暟鎹慨鐨別ms_status淇敼涓�0
+update cust_wait_pakout set ems_status = 0
\ No newline at end of file
--
Gitblit v1.9.1