From 2905c63ec884f531152a4e97a4d67034e8149d6d Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 17 12月 2024 10:28:43 +0800
Subject: [PATCH] 22
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs | 37 +++-
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/Dto/UnlineForNGPackageInput.cs | 5
LA24030_LuLiPackageLine_Pda/pages/index/index.vue | 6
CC/iWareSql/WmsDBModel/mes_push_packagecode.cs | 5
LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue | 17 +
LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue | 9
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPaperCut.cs | 6
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs | 5
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPackageCode.cs | 6
LA24030_LuLiPackageLine_Pda/api/putIn/artificial.js | 7
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs | 28 ++
LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/exceptionHandle.vue | 231 +++++++++++++++++++++++++
CC/iWareCC_ASRS/WmsTask/PushPaperCutToMes.cs | 8
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/Dto/MesPushPaperCutOutput.cs | 5
CC/iWareCC_ASRS/WmsTask/PushPackageCodeToMes.cs | 4
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/Dto/MesPushPaperCutInput.cs | 14 +
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/MesPushPaperCutService.cs | 10 +
LA24030_LuLiPackageLine_Pda/pages.json | 11 +
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKittingNg/index.vue | 36 +++
CC/iWareSql/WmsDBModel/mes_push_papercut.cs | 6
LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/component/editDialog.vue | 7
LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/index.vue | 7
LA24030_LuLiPackageLine_Pda/manifest.json | 4
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs | 23 ++
24 files changed, 469 insertions(+), 28 deletions(-)
diff --git a/CC/iWareCC_ASRS/WmsTask/PushPackageCodeToMes.cs b/CC/iWareCC_ASRS/WmsTask/PushPackageCodeToMes.cs
index cb8d14f..bbd4c8a 100644
--- a/CC/iWareCC_ASRS/WmsTask/PushPackageCodeToMes.cs
+++ b/CC/iWareCC_ASRS/WmsTask/PushPackageCodeToMes.cs
@@ -40,12 +40,13 @@
var value = edm.mes_push_packagecode.Where(x => x.PushStatus == 0 || x.PushStatus == 1).FirstOrDefault();
if (value != null)
{
+ value.PushTime = value.UpdateTime = DateTime.Now;
var res = new HTTPService(Mes_Api).getContent<Respone>(Mes_Api_packagecompleted
+ "?PackageCode=" + value.PackageCode, Guid.NewGuid(), 10000);
value.UpdateTime = DateTime.Now;
+ value.RetTime = DateTime.Now;
if (res.iState == 0)
{
- value.PushTime = value.UpdateTime = DateTime.Now;
value.UpdateUserName = SysGloble.WCSSystem;
value.PushNum++;
value.PushStatus = (int)PushStatusEnum.PushSuccess;
@@ -53,7 +54,6 @@
}
else
{
- value.PushTime = value.UpdateTime = DateTime.Now;
value.UpdateUserName = SysGloble.WCSSystem;
value.PushStatus = (int)PushStatusEnum.Pushing;
value.PushNum++;
diff --git a/CC/iWareCC_ASRS/WmsTask/PushPaperCutToMes.cs b/CC/iWareCC_ASRS/WmsTask/PushPaperCutToMes.cs
index 9e4af4e..86528c6 100644
--- a/CC/iWareCC_ASRS/WmsTask/PushPaperCutToMes.cs
+++ b/CC/iWareCC_ASRS/WmsTask/PushPaperCutToMes.cs
@@ -40,12 +40,13 @@
var value = edm.mes_push_papercut.Where(x => x.PushStatus == 0 || x.PushStatus == 1).FirstOrDefault();
if (value != null)
{
+ value.PushTime = value.UpdateTime = DateTime.Now;
var res = new HTTPService(Mes_Api).getContent<Respone>(Mes_Api_papercut
+ "?PackageCode=" + value.PackageCode, Guid.NewGuid(), 10000);
value.UpdateTime = DateTime.Now;
+ value.RetTime = DateTime.Now;
if (res.iState == 0)
{
- value.PushTime = value.UpdateTime = DateTime.Now;
value.UpdateUserName = SysGloble.WCSSystem;
value.PushNum++;
value.PushStatus = (int)PushStatusEnum.PushSuccess;
@@ -53,15 +54,18 @@
}
else
{
- value.PushTime = value.UpdateTime = DateTime.Now;
value.UpdateUserName = SysGloble.WCSSystem;
value.PushStatus = (int)PushStatusEnum.Pushing;
value.PushNum++;
value.ApiMessage = (res.message ?? "") + (res.errorMessage ?? "");
+
+ //涓嶅啀 鏇存柊涓� 鍙戦�佸け璐ャ�傚繀椤昏绛夊緟 绾哥鏈鸿繑鍥炴纭殑淇℃伅鎵嶈锛侊紒锛併�怑ditby shaocx,2024-12-17銆�
+ /*
if (value.PushNum >= 3)
{
value.PushStatus = (int)PushStatusEnum.PushFail;
}
+ //*/
}
edm.SaveChanges();
}
diff --git a/CC/iWareSql/WmsDBModel/mes_push_packagecode.cs b/CC/iWareSql/WmsDBModel/mes_push_packagecode.cs
index a02e4bb..df3bdd3 100644
--- a/CC/iWareSql/WmsDBModel/mes_push_packagecode.cs
+++ b/CC/iWareSql/WmsDBModel/mes_push_packagecode.cs
@@ -19,6 +19,11 @@
public DateTime? PushTime { get; set; }
+ /// <summary>
+ /// 返回时间
+ /// </summary>
+ public DateTime? RetTime { get; set; }
+
public int PushNum { get; set; }
public string ApiMessage { get; set; }
diff --git a/CC/iWareSql/WmsDBModel/mes_push_papercut.cs b/CC/iWareSql/WmsDBModel/mes_push_papercut.cs
index fcfa59c..b4cad56 100644
--- a/CC/iWareSql/WmsDBModel/mes_push_papercut.cs
+++ b/CC/iWareSql/WmsDBModel/mes_push_papercut.cs
@@ -19,6 +19,12 @@
public DateTime? PushTime { get; set; }
+
+ /// <summary>
+ /// 返回时间
+ /// </summary>
+ public DateTime? RetTime { get; set; }
+
public double? Info1 { get; set; }
public double? Info2 { get; set; }
diff --git a/LA24030_LuLiPackageLine_Pda/api/putIn/artificial.js b/LA24030_LuLiPackageLine_Pda/api/putIn/artificial.js
index c48c0a4..5e4caba 100644
--- a/LA24030_LuLiPackageLine_Pda/api/putIn/artificial.js
+++ b/LA24030_LuLiPackageLine_Pda/api/putIn/artificial.js
@@ -246,3 +246,10 @@
data: data
})
}
+export function PartClear(data){
+ return request({
+ url: `/api/WmsOperationTask/PartClear`,
+ method: 'post',
+ data: data
+ })
+}
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Pda/manifest.json b/LA24030_LuLiPackageLine_Pda/manifest.json
index 0fe8119..3821c06 100644
--- a/LA24030_LuLiPackageLine_Pda/manifest.json
+++ b/LA24030_LuLiPackageLine_Pda/manifest.json
@@ -1,8 +1,8 @@
{
"name" : "LuLiMuYe_Package_Pda",
"appid" : "__UNI__28D87EB",
- "description" : "2024.12.14",
- "versionName" : "1.0.5",
+ "description" : "2024.12.17",
+ "versionName" : "1.0.6",
"versionCode" : "100",
"transformPx" : false,
"app-plus" : {
diff --git a/LA24030_LuLiPackageLine_Pda/pages.json b/LA24030_LuLiPackageLine_Pda/pages.json
index c917ac5..24e152d 100644
--- a/LA24030_LuLiPackageLine_Pda/pages.json
+++ b/LA24030_LuLiPackageLine_Pda/pages.json
@@ -218,7 +218,16 @@
"enablePullDownRefresh": false
}
- },{
+ },
+ {
+ "path": "pages/takeMaterial/orderpiece/exceptionHandle",
+ "style": {
+ "navigationBarTitleText": "寮傚父澶勭悊",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ,{
"path": "pages/takeMaterial/orderpiece/orderpiecePo",
"style": {
"navigationBarTitleText": "po鏀惰揣",
diff --git a/LA24030_LuLiPackageLine_Pda/pages/index/index.vue b/LA24030_LuLiPackageLine_Pda/pages/index/index.vue
index a7ba2a1..be5b133 100644
--- a/LA24030_LuLiPackageLine_Pda/pages/index/index.vue
+++ b/LA24030_LuLiPackageLine_Pda/pages/index/index.vue
@@ -108,6 +108,12 @@
src: '../../static/index/cancel.png',
pages: '../takeMaterial/orderpiece/orderpiece'
},
+{
+ name: '寮傚父澶勭悊',
+ icon: 'icon-shouhuoguanli',
+ src: '../../static/index/cancel.png',
+ pages: '../takeMaterial/orderpiece/exceptionHandle'
+ },
{
name: '鏉夸欢鏌ョ湅',
diff --git a/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/exceptionHandle.vue b/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/exceptionHandle.vue
new file mode 100644
index 0000000..8eb98f2
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/exceptionHandle.vue
@@ -0,0 +1,231 @@
+<template>
+ <view class="overflow" style="padding-bottom: 150rpx">
+ <cu-custom bgColor="bg-white" :isBack="true">
+ <block slot="backText"> </block>
+ <block slot="content">寮傚父澶勭悊</block>
+ </cu-custom>
+
+
+ <u-form
+ labelPosition="left"
+ label-width="180rpx"
+ :model="warehouse"
+ ref="warehouseRef"
+ >
+ <!-- <u-row
+ class="border_bottom margin_top10rpx padding_left25rpx"
+ style="background-color: #fff"
+ >
+ <u-col span="12">
+ <u-form-item
+ label="鍖呰鍙�:"
+ prop="packageCode"
+ required
+ class="uFormItem"
+ >
+ <u-input
+ v-model.trim="warehouse.packageCode"
+ @confirm="getContainerData(1)"
+ placeholder="璇峰綍鍏ユ垨鎵爜"
+ class="width"
+ :focus="curFoucus"
+ >
+ </u-input>
+ </u-form-item>
+ </u-col>
+ </u-row> -->
+ <u-row
+ class="border_bottom margin_top10rpx padding_left25rpx"
+ style="background-color: #fff"
+ >
+ <u-col span="12">
+
+ <u-form-item label="" class="uFormItem">
+ <button class=" bg-grey" @click="do_PartClear">269浣嶇疆娓呴櫎鎵爜淇℃伅</button>
+ </u-form-item>
+ </u-col>
+ </u-row>
+ </u-form>
+ </div>
+ </u-popup>
+ </view>
+</template>
+<script>
+import ButtonModal from "@/components/buttonModal.vue";
+import ModalCode from "@/components/ModalCode.vue";
+import {
+ WmsOperationTaskSetNG,
+ PartClear,
+ querySingleUpiByUpi,
+ getenumDataList,
+} from "@/api/putIn/artificial.js";
+
+export default {
+ data() {
+ return {
+ operator: "",
+ warehouse: {
+ packageCode: "",
+ upi: "",
+ },
+ singlist: [ ], //璇︽儏鍒楄〃
+ ordersId: 0, //褰撳墠瀹瑰櫒缁戝畾鐨勪笂鏋跺崟
+ rescode: 0,
+ resmessage: "",
+ options: [
+ {
+ text: "璇︽儏",
+ style: {
+ backgroundColor: "#fc9f35",
+ },
+ },
+ ],
+ detailshow: false,
+ materlist: {},
+ curFoucus: true,
+ timer: null,
+ timerSm: null,
+ detailableZb: false,
+ detailable: false,
+ gridFocus: false,
+ gridable: true,
+ kwbhAllowed: false,
+ enumList: [],
+ areaCodeEnum: [],
+ upiFlagEnum: [],
+ };
+ },
+ components: {
+ ButtonModal,
+ ModalCode,
+ },
+ created() {
+ getenumDataList({
+ EnumName: "UpiStatusEnum",
+ }).then((res) => {
+ this.enumList = res.result || [];
+ });
+ getenumDataList({
+ EnumName: "AreaCodeEnum",
+ }).then((res) => {
+ this.areaCodeEnum = res.result || [];
+ });
+ getenumDataList({
+ EnumName: "UpiFlagEnum",
+ }).then((res) => {
+ this.upiFlagEnum = res.result || [];
+ });
+ },
+ onLoad() {
+ this.operator = JSON.parse(uni.getStorageSync("userInfo")).name;
+ },
+ mounted() {},
+ methods: {
+ getEnumName(value) {
+ const name = this.enumList.find((item) => item.value === value);
+ return name ? name.name : "";
+ },
+ getUpiFlagEnumName(value) {
+ const name = this.upiFlagEnum.find((item) => item.value === value);
+ return name ? name.name : "";
+ },
+ getAreaCodeEnumName(value) {
+ const name = this.areaCodeEnum.find((item) => item.value === value);
+ return name ? name.name : "";
+ },
+ //鑾峰彇鐨勪俊鎭�
+ getContainerData() {
+ if (!this.warehouse.upi) {
+ uni.showToast({
+ title: "璇锋壂閮ㄤ欢鏉＄爜",
+ icon: "none",
+ duration: 2000,
+ });
+ return;
+ }
+ querySingleUpiByUpi({
+ upi: this.warehouse.upi,
+ }).then((res) => {
+ const result = res.result;
+ if (Array.isArray(result) && result.length == 0) {
+ uni.showToast({
+ title: "鏁版嵁涓嶅瓨鍦�",
+ icon: "none",
+ duration: 5000,
+ });
+ this.singlist = [];
+ return;
+ }
+ this.singlist = res.result;
+ });
+ },
+ // 濡傛灉鎵撳紑涓�涓殑鏃跺�欙紝涓嶉渶瑕佸叧闂叾浠栵紝鍒欐棤闇�瀹炵幇鏈柟娉�
+ open(index) {
+ // 鍏堝皢姝ｅ湪琚搷浣滅殑swipeAction鏍囪涓烘墦寮�鐘舵�侊紝鍚﹀垯鐢变簬props鐨勭壒鎬ч檺鍒讹紝
+ // 鍘熸湰涓�'false'锛屽啀娆¤缃负'false'浼氭棤鏁�
+ this.singlist[index].show = true;
+ this.singlist.map((val, idx) => {
+ if (index != idx) this.singlist[idx].show = false;
+ });
+ },
+ close(index) {
+ this.singlist[index].show = false;
+ },
+ //鐗╂枡璇︽儏
+ longpress(index, eindex) {
+ this.materlist = this.singlist[index];
+ this.detailshow = true;
+ },
+
+ //纭
+ do_PartClear() {
+ const params = {
+ };
+ uni.showModal({
+ title: "娓呯悊269鎵爜淇℃伅",
+ content: "鏄惁纭娓呯悊269鎵爜淇℃伅锛�",
+ showCancel: true,
+ cancelColor: "#333333",
+ success: (res) => {
+ if (res.confirm) {
+ PartClear(params).then((res) => {
+ this.rescode = 200;
+ this.$refs.resmodal.show = true;
+ this.resmessage = "娓呯悊269鎵爜淇℃伅鎴愬姛";
+ });
+ } else if (res.cancel) {
+ }
+ },
+ });
+
+ },
+ rest() {
+ this.warehouse.upi = "";
+ this.singlist = [];
+ },
+
+
+ },
+};
+</script>
+<style lang="scss">
+.content {
+ height: 500rpx;
+ overflow-y: scroll;
+ width: 100%;
+ padding: 15rpx;
+ box-sizing: border-box;
+
+ .content-item {
+ padding: 15rpx;
+ background-color: #fff;
+ margin-bottom: 15rpx;
+ border-radius: 8rpx;
+ font-size: 32rpx;
+ }
+}
+
+.bg_item {
+ background: #ffebcd !important;
+}
+</style>
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue
index e5f7d12..7a1aba1 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/component/editDialog.vue
@@ -31,7 +31,14 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="鎺ㄩ�佹椂闂�" prop="pushTime">
- <el-date-picker v-model="ruleForm.pushTime" type="datetime" placeholder="鎺ㄩ�佹椂闂�" />
+ <el-date-picker v-model="ruleForm.pushTime" type="date" placeholder="鎺ㄩ�佹椂闂�" />
+
+ </el-form-item>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="杩斿洖鏃堕棿" prop="retTime">
+ <el-date-picker v-model="ruleForm.retTime" type="date" placeholder="杩斿洖鏃堕棿" />
</el-form-item>
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue
index 5318cf9..47ac47c 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPackageCode/index.vue
@@ -26,7 +26,13 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
<el-form-item label="鎺ㄩ�佹椂闂�">
- <el-date-picker placeholder="璇烽�夋嫨鎺ㄩ�佹椂闂�" value-format="YYYY/MM/DD HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsMesPushPackageCode.pushTimeRange" />
+ <el-date-picker placeholder="璇烽�夋嫨鎺ㄩ�佹椂闂�" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsMesPushPackageCode.pushTimeRange" />
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
+ <el-form-item label="杩斿洖鏃堕棿">
+ <el-date-picker placeholder="璇烽�夋嫨杩斿洖鏃堕棿" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsMesPushPackageCode.retTimeRange" />
</el-form-item>
</el-col>
@@ -45,6 +51,12 @@
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
<el-form-item label="鍒涘缓鏃堕棿">
<el-date-picker placeholder="璇烽�夋嫨鍒涘缓鏃堕棿" value-format="YYYY/MM/DD HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsMesPushPackageCode.createTimeRange" />
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPackageCode">
+ <el-form-item label="淇敼鏃堕棿">
+ <el-date-picker placeholder="璇烽�夋嫨淇敼鏃堕棿" value-format="YYYY/MM/DD HH:mm:ss" type="datetimerange" :default-time="defaultTimeRange" v-model="queryParamsMesPushPackageCode.updateTimeRange" />
</el-form-item>
</el-col>
@@ -81,7 +93,8 @@
<el-tag>{{ getEnumDesc(scope.row.pushStatus, getEnumPushStatusData_Index)}}</el-tag>
</template>
</el-table-column>
- <el-table-column prop="pushTime" label="鎺ㄩ�佹椂闂�" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
+ <el-table-column prop="pushTime" label="鎺ㄩ�佹椂闂�" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
+ <el-table-column prop="retTime" label="杩斿洖鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
<el-table-column prop="pushNum" label="鎺ㄩ�佹鏁�" show-overflow-tooltip="" />
<el-table-column prop="apiMessage" label="鎺ュ彛杩斿洖鍙傛暟" show-overflow-tooltip="" />
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/component/editDialog.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/component/editDialog.vue
index 98d94c3..b011a92 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/component/editDialog.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/component/editDialog.vue
@@ -58,6 +58,13 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+ <el-form-item label="杩斿洖鏃堕棿" prop="retTime">
+ <el-date-picker v-model="ruleForm.retTime" type="date" placeholder="杩斿洖鏃堕棿" />
+
+ </el-form-item>
+
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="鎺ㄩ�佹鏁�" prop="pushNum">
<el-input-number v-model="ruleForm.pushNum" placeholder="璇疯緭鍏ユ帹閫佹鏁�" clearable />
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/index.vue
index 236b2a4..c69c2b7 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/ThirdInterFace/mesPushPaperCut/index.vue
@@ -49,6 +49,12 @@
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPaperCut">
+ <el-form-item label="杩斿洖鏃堕棿">
+ <el-date-picker placeholder="璇烽�夋嫨杩斿洖鏃堕棿" value-format="YYYY/MM/DD" type="daterange" v-model="queryParamsMesPushPaperCut.retTimeRange" />
+
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMesPushPaperCut">
<el-form-item label="鎺ㄩ�佹鏁�">
<el-input-number v-model="queryParamsMesPushPaperCut.pushNum" clearable="" placeholder="璇疯緭鍏ユ帹閫佹鏁�"/>
@@ -109,6 +115,7 @@
</template>
</el-table-column>
<el-table-column prop="pushTime" label="鎺ㄩ�佹椂闂�" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
+ <el-table-column prop="retTime" label="杩斿洖鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
<el-table-column prop="pushNum" label="鎺ㄩ�佹鏁�" show-overflow-tooltip="" />
<el-table-column prop="apiMessage" label="鎺ュ彛杩斿洖鍙傛暟" show-overflow-tooltip="" />
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKittingNg/index.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKittingNg/index.vue
index 72d8834..627b29d 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKittingNg/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKittingNg/index.vue
@@ -21,7 +21,8 @@
<el-form-item>
<el-button-group style="display: flex; align-items: center">
<el-button size="large" type="primary" icon="ele-Search" @click="handleQuery"> 鏌ヨ </el-button>
- <el-button size="large" icon="ele-Finished" @click="ConfirmNg"> 鏍囪Ng </el-button>
+ <el-button size="large" icon="ele-Finished" @click="ConfirmNg"> 鏍囪NG骞朵笅绾� </el-button>
+ <el-button size="large" icon="ele-Finished" @click="ConfirmNg2"> 姝ｅ父涓嬬嚎 </el-button>
<!--
<el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI" style="margin-left:5px;"> 楂樼骇鏌ヨ </el-button>
<el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI" style="margin-left:5px;"> 闅愯棌 </el-button> -->
@@ -56,7 +57,10 @@
</div>
</div>
<ul>
-
+ <li>
+ <span class="text_left">鍖呰缂栧彿:</span>
+ <span class="text_rt">{{ tableData.packageCode }}</span>
+ </li>
<li>
<span class="text_left">鎵规鍙�:</span>
<span class="text_rt">{{ tableData.planNo }}</span>
@@ -250,7 +254,8 @@
const ConfirmNg = () => {
- ElMessageBox.confirm("鏄惁纭鏍囪Ng锛�", "鎻愮ず", {
+ tableData.value.isNG =true
+ ElMessageBox.confirm("鏄惁纭鏍囪NG骞朵笅绾匡紵", "鎻愮ず", {
confirmButtonText: "纭",
cancelButtonText: "鍙栨秷",
type: "warning"
@@ -262,7 +267,30 @@
.then((res) => {
//debugger
if (res.data.code == 200) {
- ElMessage.success("鏍囪鎴愬姛");
+ ElMessage.success("鏍囪NG骞朵笅绾挎垚鍔�");
+ tableData.value ={}
+ } else {
+ ElMessage.error(`澶辫触${res.data.code}:${JSON.stringify(res.data.message)}`);
+ }
+ });
+ })
+};
+
+const ConfirmNg2 = () => {
+ tableData.value.isNG =false
+ ElMessageBox.confirm("鏄惁纭姝ｅ父涓嬬嚎锛�", "鎻愮ず", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ ConfirmNgF({
+ ...tableData.value,
+ })
+ .then((res) => {
+ //debugger
+ if (res.data.code == 200) {
+ ElMessage.success("姝ｅ父涓嬬嚎鎴愬姛");
tableData.value ={}
} else {
ElMessage.error(`澶辫触${res.data.code}:${JSON.stringify(res.data.message)}`);
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPackageCode.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPackageCode.cs
index 1aa5d82..0a91664 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPackageCode.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPackageCode.cs
@@ -31,6 +31,12 @@
public DateTime? PushTime { get; set; }
/// <summary>
+ /// 杩斿洖鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "RetTime", ColumnDescription = "杩斿洖鏃堕棿")]
+ public DateTime? RetTime { get; set; }
+
+ /// <summary>
/// 鎺ㄩ�佹鏁�
/// </summary>
[Required]
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPaperCut.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPaperCut.cs
index 321b558..6a836ad 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPaperCut.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/MesPushPaperCut.cs
@@ -47,6 +47,12 @@
public DateTime? PushTime { get; set; }
/// <summary>
+ /// 杩斿洖鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "RetTime", ColumnDescription = "杩斿洖鏃堕棿")]
+ public DateTime? RetTime { get; set; }
+
+ /// <summary>
/// 鎺ㄩ�佹鏁�
/// </summary>
[Required]
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs
index 893db62..5ce64c9 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeInput.cs
@@ -24,6 +24,11 @@
public virtual DateTime? PushTime { get; set; }
/// <summary>
+ /// 杩斿洖鏃堕棿
+ /// </summary>
+ public virtual DateTime? RetTime { get; set; }
+
+ /// <summary>
/// 鎺ㄩ�佹鏁�
/// </summary>
public virtual int PushNum { get; set; }
@@ -100,6 +105,15 @@
/// </summary>
public List<DateTime?> PushTimeRange { get; set; }
/// <summary>
+ /// 杩斿洖鏃堕棿
+ /// </summary>
+ public DateTime? RetTime { get; set; }
+
+ /// <summary>
+ /// 杩斿洖鏃堕棿鑼冨洿
+ /// </summary>
+ public List<DateTime?> RetTimeRange { get; set; }
+ /// <summary>
/// 鎺ㄩ�佹鏁�
/// </summary>
public int? PushNum { get; set; }
@@ -118,6 +132,15 @@
/// 鍒涘缓鏃堕棿鑼冨洿
/// </summary>
public List<DateTime?> CreateTimeRange { get; set; }
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public DateTime? UpdateTime { get; set; }
+
+ /// <summary>
+ /// 淇敼鏃堕棿鑼冨洿
+ /// </summary>
+ public List<DateTime?> UpdateTimeRange { get; set; }
}
/// <summary>
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs
index 97e454d..025857c 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/Dto/MesPushPackageCodeOutput.cs
@@ -26,6 +26,11 @@
public DateTime? PushTime { get; set; }
/// <summary>
+ /// 杩斿洖鏃堕棿
+ /// </summary>
+ public DateTime? RetTime { get; set; }
+
+ /// <summary>
/// 鎺ㄩ�佹鏁�
/// </summary>
public int PushNum { get; set; }
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs
index 747f4ba..a0e9a08 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPackageCode/MesPushPackageCodeService.cs
@@ -138,12 +138,22 @@
.Select<MesPushPackageCodeOutput>();
if(input.PushTimeRange != null && input.PushTimeRange.Count >0)
{
- DateTime? start= input.PushTimeRange[0].Value;
- query = query.WhereIF(start.HasValue, u => u.PushTime >= start);
+ DateTime? start= input.PushTimeRange[0].Value.AddDays(-1);
+ query = query.WhereIF(start.HasValue, u => u.PushTime > start);
if (input.PushTimeRange.Count >1 && input.PushTimeRange[1].HasValue)
{
- var end = input.PushTimeRange[1].Value;
- query = query.Where(u => u.PushTime <= end);
+ var end = input.PushTimeRange[1].Value.AddDays(1);
+ query = query.Where(u => u.PushTime < end);
+ }
+ }
+ if(input.RetTimeRange != null && input.RetTimeRange.Count >0)
+ {
+ DateTime? start= input.RetTimeRange[0].Value.AddDays(-1);
+ query = query.WhereIF(start.HasValue, u => u.RetTime > start);
+ if (input.RetTimeRange.Count >1 && input.RetTimeRange[1].HasValue)
+ {
+ var end = input.RetTimeRange[1].Value.AddDays(1);
+ query = query.Where(u => u.RetTime < end);
}
}
if(input.CreateTimeRange != null && input.CreateTimeRange.Count >0)
@@ -156,6 +166,16 @@
query = query.Where(u => u.CreateTime <= end);
}
}
+ if(input.UpdateTimeRange != null && input.UpdateTimeRange.Count >0)
+ {
+ DateTime? start= input.UpdateTimeRange[0].Value;
+ query = query.WhereIF(start.HasValue, u => u.UpdateTime >= start);
+ if (input.UpdateTimeRange.Count >1 && input.UpdateTimeRange[1].HasValue)
+ {
+ var end = input.UpdateTimeRange[1].Value;
+ query = query.Where(u => u.UpdateTime <= end);
+ }
+ }
return query;
}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/Dto/MesPushPaperCutInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/Dto/MesPushPaperCutInput.cs
index 22fa1a2..70bbb8e 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/Dto/MesPushPaperCutInput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/Dto/MesPushPaperCutInput.cs
@@ -39,6 +39,11 @@
public virtual DateTime? PushTime { get; set; }
/// <summary>
+ /// 杩斿洖鏃堕棿
+ /// </summary>
+ public virtual DateTime? RetTime { get; set; }
+
+ /// <summary>
/// 鎺ㄩ�佹鏁�
/// </summary>
public virtual int PushNum { get; set; }
@@ -130,6 +135,15 @@
/// </summary>
public List<DateTime?> PushTimeRange { get; set; }
/// <summary>
+ /// 杩斿洖鏃堕棿
+ /// </summary>
+ public DateTime? RetTime { get; set; }
+
+ /// <summary>
+ /// 杩斿洖鏃堕棿鑼冨洿
+ /// </summary>
+ public List<DateTime?> RetTimeRange { get; set; }
+ /// <summary>
/// 鎺ㄩ�佹鏁�
/// </summary>
public int? PushNum { get; set; }
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/Dto/MesPushPaperCutOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/Dto/MesPushPaperCutOutput.cs
index 4c44854..0f6fd14 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/Dto/MesPushPaperCutOutput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/Dto/MesPushPaperCutOutput.cs
@@ -41,6 +41,11 @@
public DateTime? PushTime { get; set; }
/// <summary>
+ /// 杩斿洖鏃堕棿
+ /// </summary>
+ public DateTime? RetTime { get; set; }
+
+ /// <summary>
/// 鎺ㄩ�佹鏁�
/// </summary>
public int PushNum { get; set; }
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/MesPushPaperCutService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/MesPushPaperCutService.cs
index 8344635..7dd2c72 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/MesPushPaperCutService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/MesPushPaperCut/MesPushPaperCutService.cs
@@ -146,6 +146,16 @@
query = query.Where(u => u.PushTime < end);
}
}
+ if(input.RetTimeRange != null && input.RetTimeRange.Count >0)
+ {
+ DateTime? start= input.RetTimeRange[0].Value.AddDays(-1);
+ query = query.WhereIF(start.HasValue, u => u.RetTime > start);
+ if (input.RetTimeRange.Count >1 && input.RetTimeRange[1].HasValue)
+ {
+ var end = input.RetTimeRange[1].Value.AddDays(1);
+ query = query.Where(u => u.RetTime < end);
+ }
+ }
if(input.CreateTimeRange != null && input.CreateTimeRange.Count >0)
{
DateTime? start= input.CreateTimeRange[0].Value;
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/Dto/UnlineForNGPackageInput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/Dto/UnlineForNGPackageInput.cs
index 8ef7bca..f5ae2ef 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/Dto/UnlineForNGPackageInput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/Dto/UnlineForNGPackageInput.cs
@@ -18,6 +18,11 @@
/// </summary>
public virtual string Reason { get; set; }
+ /// <summary>
+ /// 鏄惁NG
+ /// </summary>
+ public virtual bool IsNG { get; set; }
+
}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
index 0b0d55e..05fade2 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
@@ -117,7 +117,7 @@
//涓嬬嚎鏇存柊 璁㈠崟琛ㄦ暟鎹� _mesOrderGatherRep
- await UpdateOrderGather(packageObj);
+ await UpdateOrderGather(packageObj, true);
foreach (var quan in quanList)
{
@@ -397,7 +397,7 @@
/// <summary>
- /// NG鍖呬笅绾�-鎵弿鍖呭彿
+ /// NG鍖呬笅绾挎垨 姝ｅ父鍖� 涓嬬嚎 -鎵弿鍖呭彿
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -419,6 +419,13 @@
//{
// throw Oops.Oh("鍘熷洜涓嶈兘涓虹┖");
//}
+ string _OperRemark = "姝ｅ父浜哄伐涓嬬嚎";
+ UpiFlagEnum upiFlagEnum = UpiFlagEnum.姝ｅ父;
+ if (input.IsNG)
+ {
+ upiFlagEnum = UpiFlagEnum.NG;
+ _OperRemark = "NG涓嬬嚎";
+ }
var singlePackage = await _mesPackageGatherRep.AsQueryable().Where(x => x.PackageCode == input.PackageCode).FirstAsync();
if (singlePackage == null)
@@ -431,7 +438,7 @@
throw Oops.Oh($"鍖呭彿{input.PackageCode}宸茬粡涓嬬嚎");
}
- singlePackage.UpiFlag = UpiFlagEnum.NG;
+ singlePackage.UpiFlag = upiFlagEnum;
singlePackage.UpdateTime = DateTime.Now;
singlePackage.UpiStatus = UpiStatusEnum.宸蹭笅绾�;
singlePackage.AreaCode = AreaCodeEnum.涓嬬嚎鍖哄煙;
@@ -462,7 +469,7 @@
wmsRecordUpi.CreateTime = DateTime.Now;
wmsRecordUpi.CreateUserName = _cretaorName;
wmsRecordUpi.Location = "";
- wmsRecordUpi.OperRemark = "NG涓嬬嚎";
+ wmsRecordUpi.OperRemark = _OperRemark;
await _wmsRecordUpiProcessRep.InsertAsync(wmsRecordUpi);
WmsRecordUpiNg wmsRecordUpiNg = new WmsRecordUpiNg();
@@ -470,7 +477,7 @@
wmsRecordUpiNg.Id = Yitter.IdGenerator.YitIdHelper.NextId();
wmsRecordUpiNg.CreateTime = DateTime.Now;
wmsRecordUpiNg.CreateUserName = _cretaorName;
- wmsRecordUpiNg.OperRemark = "NG涓嬬嚎";
+ wmsRecordUpiNg.OperRemark = _OperRemark;
await _wmsRecordUpiNgRep.InsertAsync(wmsRecordUpiNg);
@@ -492,14 +499,14 @@
}
//涓嬬嚎鏇存柊 璁㈠崟琛ㄦ暟鎹� _mesOrderGatherRep
- await UpdateOrderGather(singlePackage);
+ await UpdateOrderGather(singlePackage, input.IsNG);
WmsRecordPackageProcess wmsRecordPackage = new WmsRecordPackageProcess();
wmsRecordPackage = singlePackage.Adapt<WmsRecordPackageProcess>();
wmsRecordPackage.Id = Yitter.IdGenerator.YitIdHelper.NextId();
wmsRecordPackage.Location = "";
- wmsRecordPackage.OperRemark = "NG涓嬬嚎";
+ wmsRecordPackage.OperRemark = _OperRemark;
wmsRecordPackage.CreateTime = DateTime.Now;
wmsRecordPackage.CreateUserName = _cretaorName;
await _wmsRecordPackageProcessRep.InsertAsync(wmsRecordPackage);
@@ -515,7 +522,7 @@
/// </summary>
/// <param name="singlePackage"></param>
/// <returns></returns>
- private async Task UpdateOrderGather(Mes_Package_Gather singlePackage)
+ private async Task UpdateOrderGather(Mes_Package_Gather singlePackage, bool isNG)
{
//涓嬬嚎鏇存柊 璁㈠崟琛ㄦ暟鎹� _mesOrderGatherRep
bool isAdd = false;
@@ -533,11 +540,22 @@
var packageList = await _mesPackageGatherRep.AsQueryable().Where(x => x.Info5 == singlePackage.Info5).ToListAsync();
order.PackageNum = packageList.Count();
order.UnLinePackageNum = packageList.Where(x => x.UpiStatus == UpiStatusEnum.宸蹭笅绾�).Count() + 1;
- order.NgPackageNum = packageList.Where(x => x.UpiStatus == UpiStatusEnum.宸蹭笅绾� && x.UpiFlag == UpiFlagEnum.NG).Count() + 1;
+
+ order.NgPackageNum = packageList.Where(x => x.UpiStatus == UpiStatusEnum.宸蹭笅绾� && x.UpiFlag == UpiFlagEnum.NG).Count();
+ if (isNG)
+ {
+ order.NgPackageNum = order.NgPackageNum + 1;
+ }
+
order.NoUnLinePackageNum = order.PackageNum - order.UnLinePackageNum;
order.AllPackageArea = packageList.Sum(x => Convert.ToDecimal(x.Info13));
order.ScanPackageArea = packageList.Where(x => x.UpiStatus == UpiStatusEnum.宸蹭笅绾� && x.UpiFlag == (int)UpiFlagEnum.姝ｅ父).Sum(x => Convert.ToDecimal(x.Info13));
+ if (isNG == false)
+ {
+ order.ScanPackageArea = order.ScanPackageArea + Convert.ToDecimal(singlePackage.Info13);
+ }
+
order.NoScanPackageArea = order.AllPackageArea - order.ScanPackageArea;
if (isAdd)
{
@@ -733,7 +751,6 @@
[HttpPost]
[ApiDescriptionSettings(Name = "PartClear")]
[Description("WmsOperationTask/PartClear")]
- [UnitOfWork]
public async Task PartClear()
{
//妯″紡鍒ゆ柇
--
Gitblit v1.9.3