diff --git a/src/api/request2.js b/src/api/request2.js
index 9f5389f7..f7fb70e6 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -4251,18 +4251,55 @@ export function getPlaneInfoByproductLine(productionLine,planDate) {
}
/**
- * 按
+ * 按计划完工提交
* @param {*}
*/
export function planReceiptSubmit(params) {
return request({
- url: baseApi + "/wms/production-main/getPlanProductionByProductionLineAndPlanDate",
+ url: baseApi + "/wms/productreceipt-record-main/createByPlan",
method: "post",
data:params
});
}
+/**
+ * @param {Object} params 创建计划完工后调用上架申请 number
+ */
+export function createPutawayRequestByPlan(number) {
+ return request({
+ url: baseApi + "/wms/productreceipt-record-main/createPutawayRequest?number="+number,
+ method: "post",
+ data:{}
+ });
+}
+
+/**
+ * @param {Object} params 创建检验申请 number
+ */
+export function createInspectRequestByPlan(number) {
+ return request({
+ url: baseApi + "/wms/productreceipt-record-main/createInspectRequest?number="+number,
+ method: "post",
+ data:{}
+ });
+}
+
+
+/**
+ * @param {Object} params 查询计划报工单号 number
+ */
+export function getPlanByNumber(params) {
+ return request({
+ url: baseApi + "/wms/production-detail/senior",
+ method: "post",
+ data:params
+ });
+}
+
+
+
+//查询生产线
export function getProductionlineAndWorkStation() {
return request({
url: baseApi + "/wms/production-main/getProductionlineAndWorkStation",
diff --git a/src/common/basic.js b/src/common/basic.js
index 93bc8860..3a7f4b54 100644
--- a/src/common/basic.js
+++ b/src/common/basic.js
@@ -904,6 +904,16 @@ export function dateFormat(time) {
return result;
}
+//2024-07-19
+export function dateFormatData(time) {
+ var result = ""
+ if (time != null) {
+ let date = new Date(time);
+ result = getDate(date);
+ }
+
+ return result;
+}
//获取日期部分
export function getDate(date) {
@@ -1076,4 +1086,8 @@ export function deepCopyData(target) {
}
return cloneTarget;
+}
+//数组去重重复数据
+export function uniqueArray(arr) {
+ return arr.filter((item, index, self) => self.indexOf(item) === index);
}
\ No newline at end of file
diff --git a/src/common/scan.js b/src/common/scan.js
new file mode 100644
index 00000000..d4ddbfdb
--- /dev/null
+++ b/src/common/scan.js
@@ -0,0 +1,29 @@
+import {
+ getLabelInfo
+} from '@/common/label.js';
+
+// export function getLabelInfoResult(scanMsg, headerType callBackInfo) {
+// let index = scanMsg.indexOf('\n');
+// if (index >= 0) {
+// // let content = uni.$u.trim(scanMsg)
+// let content = scanMsg
+// if (content == "") {
+// return ""
+// }
+
+// getLabelInfo(content, headerType, callback => {
+// let scanResult = callback;
+// scanResult.scanMessage = content
+// if (scanResult.success) {
+// return scanResult
+// } else {
+// return ""
+// }
+// });
+
+// }
+// }
+
+export function getLabelInfoResult(){
+
+}
diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index 20b73a36..41120cb1 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2463,6 +2463,16 @@ button[disabled] {
width: 180rpx;
}
+.btn_single_clear {
+ background-color: #EBEEF0;
+ font-size: 30rpx;
+ color: #000;
+ text-align: center;
+ width: 180rpx;
+}
+
+
+
.btn_single_reject {
background-color: #F56C6C;
font-size: 30rpx;
diff --git a/src/mycomponents/scan/winComScanFg.vue b/src/mycomponents/scan/winComScanFg.vue
index d1445390..531c5a36 100644
--- a/src/mycomponents/scan/winComScanFg.vue
+++ b/src/mycomponents/scan/winComScanFg.vue
@@ -188,6 +188,7 @@
getMesPackInfo(this.itemCode).then(res => {
try {
if (res.data.list.length == 0) {
+ that.clear();
throw new Error("没有查找到物料号【" + this.itemCode + "】对应的生产条码配置")
}
var result = res.data.list[0] //Mes条码标签解析规格
diff --git a/src/pages/fg/coms/comReceiptPopup.vue b/src/pages/fg/coms/comReceiptPopup.vue
index 7274125c..f6ad6dfd 100644
--- a/src/pages/fg/coms/comReceiptPopup.vue
+++ b/src/pages/fg/coms/comReceiptPopup.vue
@@ -49,14 +49,13 @@
批次:
-
+
-