diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
index c676ee25d..14cf7e5a1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
@@ -44,6 +44,7 @@ public class StructivtServiceImpl implements StructivtService {
String struct = MapUtil.getStr(whereJson, "struct");
String stor_id = MapUtil.getStr(whereJson, "stor_id");
String pcsn = MapUtil.getStr(whereJson, "pcsn");
+ String sap_pcsn = MapUtil.getStr(whereJson, "sap_pcsn");
JSONObject map = new JSONObject();
map.put("flag", "1");
map.put("stor_id", stor_id);
@@ -56,6 +57,9 @@ public class StructivtServiceImpl implements StructivtService {
if (StrUtil.isNotEmpty(pcsn)) {
map.put("pcsn", "%" + pcsn + "%");
}
+ if (StrUtil.isNotEmpty(sap_pcsn)) {
+ map.put("sap_pcsn", "%" + sap_pcsn + "%");
+ }
JSONObject jsonObject = WQL.getWO("QST_STRUCTIVT001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ivt.instorage_time desc");
return jsonObject;
}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
index 7f0bd4cb4..ac60f54b1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
@@ -18,6 +18,7 @@
输入.material TYPEAS s_string
输入.stor_id TYPEAS s_string
输入.pcsn TYPEAS s_string
+ 输入.sap_pcsn TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
@@ -82,6 +83,10 @@
ivt.pcsn like 输入.pcsn
ENDOPTION
+ OPTION 输入.sap_pcsn <> ""
+ sub.sap_pcsn like 输入.sap_pcsn
+ ENDOPTION
+
OPTION 输入.stor_id <> ""
attr.stor_id = 输入.stor_id
ENDOPTION
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java
index 1c38bc4bb..328a06ee0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java
@@ -19,9 +19,7 @@ import org.nl.wms.st.inbill.service.CheckOutBillService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
+import java.io.*;
/**
* @author liuxy
@@ -107,7 +105,8 @@ public class PrintServiceImpl implements PrintService {
file.createNewFile();
}
fw = new FileWriter(filePath);
- BufferedWriter bw = new BufferedWriter(fw);
+ OutputStreamWriter write = new OutputStreamWriter(new FileOutputStream(file), "utf-8");
+ BufferedWriter bw = new BufferedWriter(write);
bw.write("package_box_sn1,package_box_sn2,sale_order_name,product_description,product_name,width,pcsn,date_of_FG_inbound,box_weight,date_of_production,quanlity_in_box,quality_guaran_period,nspector,storage_conditions,weight\n");
bw.write(package_box_sn1 + ","
@@ -128,6 +127,7 @@ public class PrintServiceImpl implements PrintService {
);
bw.close();
+ jo.put("message", "打印成功！");
} catch (Exception e) {
jo.put("message", "打印失败！"+e.getMessage());
} finally {
@@ -137,7 +137,6 @@ public class PrintServiceImpl implements PrintService {
jo.put("message", "打印失败！"+e.getMessage());
}
}
- jo.put("message", "打印成功！");
return jo;
}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
index 5da90c5cd..98a2862b1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
@@ -88,6 +88,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
map.put("flag", "7");
map.put("begin_time", MapUtil.getStr(whereJson, "begin_time"));
map.put("end_time", MapUtil.getStr(whereJson, "end_time"));
+ map.put("sap_pcsn", MapUtil.getStr(whereJson, "sap_pcsn"));
map.put("canuse_qty", "0");
if (StrUtil.isNotEmpty(map.get("material_code"))) {
@@ -96,6 +97,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
if (StrUtil.isNotEmpty(map.get("pcsn"))) {
map.put("pcsn", "%" + map.get("pcsn") + "%");
}
+ if (StrUtil.isNotEmpty(map.get("sap_pcsn"))) {
+ map.put("sap_pcsn", "%" + map.get("sap_pcsn") + "%");
+ }
JSONObject jo = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ivt.struct_code ASC");
return jo;
}
@@ -1838,7 +1842,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
}
//判断是否存在未确认状态的分配记录
- JSONObject task = wo_dis.query("work_status <>'99' and iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0);
+ /* JSONObject task = wo_dis.query("work_status <>'99' and iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(task)) {
JSONArray ja00 = wo_dis.query("work_status ='00' and iostorinv_id = '" + iostorinv_id + "'").getResultJSONArray(0);
JSONArray jatotal = wo_dis.query("iostorinv_id = '" + iostorinv_id + "'").getResultJSONArray(0);
@@ -1847,7 +1851,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
} else {
throw new BadRequestException("存在未确认状态的出库分配记录，不允许强制确认！");
}
- }
+ }*/
//查询生成和未分配完的明细
JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL")
@@ -2450,7 +2454,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
// 订单号
String source_bill_code = jsonDtl.getString("source_bill_code");
if (ObjectUtil.isNotEmpty(source_bill_code)) {
- oneMap.put("order_no",source_bill_code.substring(0,source_bill_code.indexOf("-")));
+ try {
+ oneMap.put("order_no",source_bill_code.substring(0,source_bill_code.indexOf("-")));
+ } catch (Exception e) {
+ oneMap.put("order_no",source_bill_code);
+ }
}
}
String pageNow = String.valueOf(j + 1); // 页码
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
index c807887ae..db2b2607e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
@@ -45,6 +45,7 @@
输入.sale_order_name TYPEAS s_string
输入.box_no TYPEAS s_string
输入.canuse_qty TYPEAS s_string
+ 输入.sap_pcsn TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
@@ -456,7 +457,8 @@
mater.material_name,
mater.material_code,
unit.unit_name AS qty_unit_name,
- attr.storagevehicle_code AS box_no
+ attr.storagevehicle_code AS box_no,
+ sub.sap_pcsn
FROM
ST_IVT_StructIvt ivt
LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id
@@ -472,6 +474,10 @@
mater.material_name like 输入.material_code)
ENDOPTION
+ OPTION 输入.sap_pcsn <> ""
+ sub.sap_pcsn like 输入.sap_pcsn
+ ENDOPTION
+
OPTION 输入.pcsn <> ""
ivt.pcsn like 输入.pcsn
ENDOPTION
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
index 414286d76..575e81342 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
@@ -57,6 +57,16 @@
class="filter-item"
/>
+
+
+
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue b/lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue
index 5e79d1508..22f846578 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue
@@ -31,6 +31,15 @@
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
+
@@ -50,6 +59,7 @@
+
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
index 13c952a0f..daa79da85 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
@@ -331,7 +331,7 @@ export default {
} else {
this.work_flag = true
}
- if (current.bill_status === '50' || current.bill_status === '40') {
+ if (current.bill_status === '50' || current.bill_status === '40' || current.bill_status === '30') {
this.confirm_flag = false
} else {
this.confirm_flag = true
@@ -375,6 +375,7 @@ export default {
confirm() {
checkoutbill.confirm({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
this.querytable()
+ this.crud.notify('出库成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
querytable() {