diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java
index d0f5b2d5..b84861be 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java
@@ -125,6 +125,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
if (StrUtil.isNotEmpty(map.get("remark"))) {
map.put("remark", "%" + map.get("remark") + "%");
}
+ if (StrUtil.isNotEmpty(map.get("pcsn"))) {
+ map.put("pcsn", map.get("pcsn"));
+ }
String begin_time = map.get("begin_time");
String end_time = map.get("end_time");
if (StrUtil.isNotEmpty(begin_time)) {
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL.wql
index c6ed75dc..d70c4503 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL.wql
@@ -545,6 +545,9 @@
OPTION 输入.bill_code <> ""
qlmst.inspection_code like 输入.bill_code
ENDOPTION
+ OPTION 输入.pcsn <> ""
+ qldtl.pcsn = 输入.pcsn
+ ENDOPTION
OPTION 输入.begin_time <> ""
qlmst.biz_date >= 输入.begin_time
ENDOPTION
diff --git a/mes/qd/src/views/wms/pf/initformula/DivDialog.vue b/mes/qd/src/views/wms/pf/initformula/DivDialog.vue
index 3bd2e09a..e439fb20 100644
--- a/mes/qd/src/views/wms/pf/initformula/DivDialog.vue
+++ b/mes/qd/src/views/wms/pf/initformula/DivDialog.vue
@@ -1136,6 +1136,10 @@ export default {
this.tableDtl = res.tableDtl
this.form2.total_qty1 = 0
this.form2.add_qty1 = 0
+ this.ball_time = res.ball_time
+ if ((parseFloat(this.ball_time) > 0)) {
+ this.form.ball_time = parseFloat(this.ball_time)
+ }
for (let i = 0; i < this.tableDtl.length; i++) {
const row = this.tableDtl[i]
row.edit = true
diff --git a/mes/qd/src/views/wms/st/core/outbill/checkoutbill/AddDtl.vue b/mes/qd/src/views/wms/st/core/outbill/checkoutbill/AddDtl.vue
index dffd69be..f113b65d 100644
--- a/mes/qd/src/views/wms/st/core/outbill/checkoutbill/AddDtl.vue
+++ b/mes/qd/src/views/wms/st/core/outbill/checkoutbill/AddDtl.vue
@@ -39,6 +39,15 @@
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
+