diff --git a/src/api/request2.js b/src/api/request2.js
index cf3cb625..478889b6 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -2641,14 +2641,37 @@ export function getPlaneInfoByproductLine(productionLine,planDate) {
}
/**
- * 按
+ * 按计划完工提交
* @param {*}
*/
export function planReceiptSubmit(data) {
- return http.post("/wms/production-main/getPlanProductionByProductionLineAndPlanDate",data)
+ return http.post( "/wms/productreceipt-record-main/createByPlan",data)
}
+/**
+ * @param {Object} params 创建计划完工后调用上架申请 number
+ */
+export function createPutawayRequestByPlan(number) {
+ return http.post("/wms/productreceipt-record-main/createPutawayRequest?number="+number)
+}
+
+/**
+ * @param {Object} params 创建检验申请 number
+ */
+export function createInspectRequestByPlan(number) {
+ return http.post("/wms/productreceipt-record-main/createInspectRequest?number="+number)
+}
+
+
+/**
+ * @param {Object} params 查询计划报工单号 number
+ */
+export function getPlanByNumber(data) {
+ return http.post("/wms/production-detail/senior",data)
+}
+
+//查询生产线
export function getProductionlineAndWorkStation() {
return http.get("/wms/production-main/getProductionlineAndWorkStation")
}
\ No newline at end of file
diff --git a/src/common/basic.js b/src/common/basic.js
index 2ed70ee4..929a572e 100644
--- a/src/common/basic.js
+++ b/src/common/basic.js
@@ -896,6 +896,15 @@ export function dateFormat(time) {
return result;
}
+export function dateFormatData(time) {
+ var result = ""
+ if (time != null) {
+ let date = new Date(time);
+ result = getDate(date);
+ }
+
+ return result;
+}
//获取日期部分
export function getDate(date) {
@@ -1069,3 +1078,7 @@ export function deepCopyData(target) {
return cloneTarget;
}
+//数组去重重复数据
+export function uniqueArray(arr) {
+ return arr.filter((item, index, self) => self.indexOf(item) === index);
+}
diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index ed9cf986..3348c592 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2480,6 +2480,14 @@ button[disabled] {
text-align: center;
width: 180rpx;
}
+.btn_single_clear {
+ background-color: #EBEEF0;
+ font-size: 30rpx;
+ color: #000;
+ text-align: center;
+ width: 180rpx;
+}
+
.btn_single_reject {
background-color: #F56C6C;
diff --git a/src/mycomponents/scan/winComScanFg.vue b/src/mycomponents/scan/winComScanFg.vue
index c45dc21a..a5de7a1e 100644
--- a/src/mycomponents/scan/winComScanFg.vue
+++ b/src/mycomponents/scan/winComScanFg.vue
@@ -169,6 +169,7 @@ const handelScanMsg = () => {
.then((res) => {
try {
if (res.data.list.length == 0) {
+ clear()
throw new Error(`没有查找到物料号【${itemCode.value}】对应的生产条码配置`)
}
const result = res.data.list[0] // Mes条码标签解析规格
diff --git a/src/pages/fg/coms/comReceiptPopup.vue b/src/pages/fg/coms/comReceiptPopup.vue
index 32778411..6654bbf6 100644
--- a/src/pages/fg/coms/comReceiptPopup.vue
+++ b/src/pages/fg/coms/comReceiptPopup.vue
@@ -45,7 +45,6 @@
-