修复部分配送问题

config/host.js

@@ -15,9 +15,9 @@
 // const devhost = 'http://192.168.6.148:9777/'
 // const devhost = 'http://192.168.6.141:8777/'
 // cg
-// const devhost = 'http://192.168.10.57:13000/'
+const devhost = 'http://192.168.10.57:13000/'
 // 正式
-const devhost = 'https://h5uapi.huitongys.com/'
+// const devhost = 'https://h5uapi.huitongys.com/'
 // cg
 // const devhost = 'http://192.168.10.200:13000/'
 /**

manifest.json

@@ -2,8 +2,8 @@
     "name" : "货无忧",
     "appid" : "__UNI__EB22F37",
     "description" : "",
-    "versionName" : "1.1.04",
-    "versionCode" : 1104,
+    "versionName" : "1.1.07",
+    "versionCode" : 1107,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue

@@ -86,7 +86,8 @@
 										<block v-for="ite in item.distributionAppParcelListVOS">
 											<uni-tr
 												:class="{'active': Number(ite.isAbnormalLoading) === 1 || Number(ite.isAbnnormalSigning) === 1}">
-												<uni-td>{{ite.orderPackageCode}}</uni-td>
+												<uni-td
+													:class="{'isScan': ite.orderPackageStatus !== '70'}">{{ite.orderPackageCode}}</uni-td>
 												<uni-td>{{ite.thirdProduct}}</uni-td>
 												<uni-td>{{ite.isScan}}</uni-td>
 												<uni-td
@@ -1047,4 +1048,9 @@
 	.uni-scroll-view {
 		overflow: hidden;
 	}
+
+	.isScan {
+		background: var(--subjectColor);
+		color: #fff;
+	}
 </style>

pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue

@@ -217,7 +217,7 @@
 		let response = await warehouseTrayTypeorderDetail(data)
 		if (response.code !== 200) return
 		details.list = response.data.parcelList
-		details.detaobj = response.data
+		details.detaobj = response.data || []
 		let set = new Set()
 		response.data.parcelList.map(item => {
 			set.add(item.trayName)

pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue

@@ -286,6 +286,8 @@
 		})
 	}
 	async function scandata() {
+		if (Number(details.planNum) === Number(details.scanNum)) return utils.handleToast('该客户已齐套')
+
 		// 查看模式不执行扫描
 		if (Number(details.status) !== 0) return
 		let data = {
@@ -334,7 +336,7 @@
 		details.warehouseArea = response.data.warehouseArea
 		details.address = response.data.address
 		if (Number(details.scanNum) > 0 && details.isscan) {
-			utils.ttsspke('扫描' + details.scanNum + '件')
+			utils.ttsspke(details.scanNum + '件')
 		}
 	}
 	const { dataList } = toRefs(details)

pagesHome/pages/signOrderScan/signOrderScan.vue

@@ -85,7 +85,8 @@
 								<block v-for="ite in item.distributionAppParcelListVOS">
 									<uni-tr
 										:class="{'active': Number(ite.isAbnormalLoading) === 1 || Number(ite.isAbnnormalSigning) === 1}">
-										<uni-td>{{ite.orderPackageCode}}</uni-td>
+										<uni-td
+											:class="{'isScan': ite.orderPackageStatus !== '70'}">{{ite.orderPackageCode}}</uni-td>
 										<uni-td>{{ite.thirdProduct}}</uni-td>
 										<uni-td>{{ite.orderPackageStatus === '70'?'已扫':'未扫'}}</uni-td>
 										<uni-td
@@ -335,6 +336,8 @@
 		}, 500)
 	})
 	async function scandata() {
+		details.listcheckindex = -1
+
 		let data = {
 			barcode: details.scancode,
 			deliveryId: details.deliveryId,
@@ -907,6 +910,11 @@
 		}
 	}
 
+	.isScan {
+		background: var(--subjectColor);
+		color: #fff;
+	}
+
 	.uni-table .active:hover {
 		background: #ff4344 !important;
 	}

unpackage/dist/dev/app-plus/app-service.js

@@ -1747,7 +1747,7 @@ if (uni.restoreGlobal) {
     };
   };
   const Base64$1 = new Base64();
-  const devhost = "http://192.168.10.200:13000/";
+  const devhost = "http://192.168.10.57:13000/";
   const imghost = "";
   const host = devhost;
   const APPKEY = "h5u:h5u_secret";
@@ -20845,6 +20845,8 @@ This will fail in production if not fixed.`);
         });
       }
       async function scandata() {
+        if (Number(details.planNum) === Number(details.scanNum))
+          return utils.handleToast("该客户已齐套");
         if (Number(details.status) !== 0)
           return;
         let data = {
@@ -20858,7 +20860,7 @@ This will fail in production if not fixed.`);
           typeService: details.typeService
         };
         let res = await distributionStockupstockupScan(data);
-        formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:302", res);
+        formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:304", res);
         if (res.code == 200) {
           details.isscan = true;
           basicContainer.value.startPullDownRefresh();
@@ -20883,7 +20885,7 @@ This will fail in production if not fixed.`);
         let response = await distributionStockuporderInfo(data);
         if (response.code !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:327", response);
+        formatAppLog("log", "at pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue:329", response);
         details.dataList = response.data.packageList;
         details.customer = response.data.customer;
         details.stockupArea = response.data.stockupArea;
@@ -20893,7 +20895,7 @@ This will fail in production if not fixed.`);
         details.warehouseArea = response.data.warehouseArea;
         details.address = response.data.address;
         if (Number(details.scanNum) > 0 && details.isscan) {
-          utils.ttsspke("扫描" + details.scanNum + "件");
+          utils.ttsspke(details.scanNum + "件");
         }
       }
       const { dataList } = vue.toRefs(details);
@@ -26278,7 +26280,7 @@ This will fail in production if not fixed.`);
           uni.$off("scancodedate");
           uni.$on("scancodedate", function(code2) {
             if (code2) {
-              formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:255", code2);
+              formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:256", code2);
               details.scancode = code2;
               scandata();
             }
@@ -26314,8 +26316,8 @@ This will fail in production if not fixed.`);
             return;
           if (response1.data)
             details.stockArr = response1.data.records || [];
-          formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:296", "response :>> ", response);
-          formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:297", "response1 :>> ", response1);
+          formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:297", "response :>> ", response);
+          formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:298", "response1 :>> ", response1);
           if (details.orderStatus === 1)
             details.datalist = details.orderArr;
           else if (details.orderStatus === 2)
@@ -26323,13 +26325,13 @@ This will fail in production if not fixed.`);
           else
             details.datalist = details.stockArr;
         } catch (err) {
-          formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:305", "err :>> ", err);
+          formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:306", "err :>> ", err);
         }
       });
       vue.onMounted(async () => {
         await vue.nextTick();
         utils2.getViewDistanceFormTop(".scve").then((res) => {
-          formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:317", "res :>> ", res);
+          formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:318", "res :>> ", res);
           details.scrollHeight = res;
         });
       });
@@ -26346,6 +26348,7 @@ This will fail in production if not fixed.`);
         }, 500);
       });
       async function scandata() {
+        details.listcheckindex = -1;
         let data = {
           barcode: details.scancode,
           deliveryId: details.deliveryId,
@@ -26353,7 +26356,7 @@ This will fail in production if not fixed.`);
         };
         if (Number(details.orderStatus) == 1) {
           let response = await signforsignfor(data);
-          formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:346", response);
+          formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:349", response);
           if (response.code === 200)
             ;
           else if (response.code == 3006) {
@@ -26369,7 +26372,7 @@ This will fail in production if not fixed.`);
                 let response2 = await signforsignforcontinue(data2);
                 if (response2.code !== 200)
                   return;
-                formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:365", response2);
+                formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:368", response2);
                 uni.showToast({
                   title: response2.msg,
                   icon: "none"
@@ -26391,7 +26394,7 @@ This will fail in production if not fixed.`);
           }
         } else if (Number(details.orderStatus) === 3) {
           let response = await signforsignforIn(data);
-          formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:388", response);
+          formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:391", response);
           if (response.code == 3006) {
             tip.value.setdetails({
               isshow: true,
@@ -26403,7 +26406,7 @@ This will fail in production if not fixed.`);
                   reservationId: details.id
                 };
                 let response2 = await signforsignforcontinue(data2);
-                formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:400", response2);
+                formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:403", response2);
                 if (response2.code !== 200)
                   return;
                 uni.showToast({
@@ -26486,7 +26489,7 @@ This will fail in production if not fixed.`);
               if (value.isAbnormalLoading === 1)
                 val.abnormalLoading += 1;
             });
-            formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:496", "val :>> ", val);
+            formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:499", "val :>> ", val);
             details.orderArr.push(val);
           });
         } else if (details.orderStatus == 3) {
@@ -26523,7 +26526,7 @@ This will fail in production if not fixed.`);
         });
       }
       function checkphon(item, index2) {
-        formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:537", "item :>> ", item);
+        formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:540", "item :>> ", item);
         if (item.isZero === "1") {
           const inpList = item.distributionParcelNumberVOS.map((val) => {
             return {
@@ -26565,7 +26568,7 @@ This will fail in production if not fixed.`);
                   parcelListDTOS: []
                 };
                 data.parcelListDTOS = deta.inpList.map((val) => {
-                  formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:581", "val :>> ", val);
+                  formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:584", "val :>> ", val);
                   return {
                     parcelListId: val.id,
                     stockArticleId: val.stockArticleId,
@@ -26580,7 +26583,7 @@ This will fail in production if not fixed.`);
                 }
                 initpage();
               } catch (err) {
-                formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:598", "err :>> ", err);
+                formatAppLog("log", "at pagesHome/pages/signOrderScan/signOrderScan.vue:601", "err :>> ", err);
               } finally {
                 uni.hideLoading();
                 tiplists.value.setdetails({ isshow: false });
@@ -26918,23 +26921,19 @@ This will fail in production if not fixed.`);
                                           class: vue.normalizeClass({ "active": Number(ite.isAbnormalLoading) === 1 || Number(ite.isAbnnormalSigning) === 1 })
                                         }, {
                                           default: vue.withCtx(() => [
-                                            vue.createVNode(
-                                              _component_uni_td,
-                                              null,
-                                              {
-                                                default: vue.withCtx(() => [
-                                                  vue.createTextVNode(
-                                                    vue.toDisplayString(ite.orderPackageCode),
-                                                    1
-                                                    /* TEXT */
-                                                  )
-                                                ]),
-                                                _: 2
-                                                /* DYNAMIC */
-                                              },
-                                              1024
-                                              /* DYNAMIC_SLOTS */
-                                            ),
+                                            vue.createVNode(_component_uni_td, {
+                                              class: vue.normalizeClass({ "isScan": ite.orderPackageStatus === "70" })
+                                            }, {
+                                              default: vue.withCtx(() => [
+                                                vue.createTextVNode(
+                                                  vue.toDisplayString(ite.orderPackageCode),
+                                                  1
+                                                  /* TEXT */
+                                                )
+                                              ]),
+                                              _: 2
+                                              /* DYNAMIC */
+                                            }, 1032, ["class"]),
                                             vue.createVNode(
                                               _component_uni_td,
                                               null,
@@ -32986,7 +32985,7 @@ This will fail in production if not fixed.`);
         if (response.code !== 200)
           return;
         details.list = response.data.parcelList;
-        details.detaobj = response.data;
+        details.detaobj = response.data || [];
         let set2 = /* @__PURE__ */ new Set();
         response.data.parcelList.map((item) => {
           set2.add(item.trayName);

unpackage/dist/dev/app-plus/manifest.json

@@ -7,8 +7,8 @@
   "id": "__UNI__EB22F37",
   "name": "货无忧",
   "version": {
-    "name": "1.1.04",
-    "code": 1104
+    "name": "1.1.07",
+    "code": 1107
   },
   "description": "",
   "developer": {

unpackage/dist/dev/app-plus/pagesHome/pages/signOrderScan/signOrderScan.css

@@ -1008,6 +1008,10 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
 .active td[data-v-fb393026] {
   color: #fff;
 }
+.isScan[data-v-fb393026] {
+  background: var(--subjectColor);
+  color: #fff;
+}
 .uni-table .active[data-v-fb393026]:hover {
   background: #ff4344 !important;
 }

unpackage/dist/dev/mp-weixin/api/user.js

@@ -30,6 +30,26 @@ function postFindAllAllocationId(loadingObj = {}) {
     loadingObj
   );
 }
+function distributionStockupupdateStockArea(data, loadingObj = {}) {
+  return utils_request.service(
+    {
+      url: `logpm-distribution/app/distributionStockup/updateStockArea`,
+      method: "put",
+      data
+    },
+    loadingObj
+  );
+}
+function distributionStockupgetStockupArea(data, loadingObj = {}) {
+  return utils_request.service(
+    {
+      url: `logpm-distribution/app/distributionStockup/getStockupArea`,
+      method: "post",
+      data
+    },
+    loadingObj
+  );
+}
 function distributionStockuppageList(data, loadingObj = {}) {
   return utils_request.service(
     {
@@ -40,6 +60,16 @@ function distributionStockuppageList(data, loadingObj = {}) {
     loadingObj
   );
 }
+function distributionStockuppageListClient(data, loadingObj = {}) {
+  return utils_request.service(
+    {
+      url: `logpm-distribution/app/distributionStockup/pageListClient`,
+      method: "post",
+      data
+    },
+    loadingObj
+  );
+}
 function distributionStockuporderList(data, loadingObj = {}) {
   return utils_request.service(
     {
@@ -1510,6 +1540,76 @@ function postArriveUnloadPageList(data, loadingObj = {}) {
     loadingObj
   );
 }
+function postArriveUnloadCarsDetail(data, loadingObj = {}) {
+  return utils_request.service(
+    {
+      url: `logpm-trunkline/api/carsLoad/unloadCarsDetail`,
+      method: "post",
+      data
+    },
+    loadingObj
+  );
+}
+function postCarsLoadUnloadPackage(data, loadingObj = {}) {
+  return utils_request.service(
+    {
+      url: `logpm-trunkline/api/carsLoad/unloadPackage`,
+      method: "post",
+      data
+    },
+    loadingObj
+  );
+}
+function postCarsLoadUnloadZero(data, loadingObj = {}) {
+  return utils_request.service(
+    {
+      url: `logpm-trunkline/api/carsLoad/unloadZero`,
+      method: "post",
+      data
+    },
+    loadingObj
+  );
+}
+function postFindUnloadTrayGoodsList(data, loadingObj = {}) {
+  return utils_request.service(
+    {
+      url: `logpm-trunkline/api/carsLoad/findUnloadTrayGoodsList`,
+      method: "post",
+      data
+    },
+    loadingObj
+  );
+}
+function postUnloadTray(data, loadingObj = {}) {
+  return utils_request.service(
+    {
+      url: `logpm-trunkline/api/carsLoad/unloadTray`,
+      method: "post",
+      data
+    },
+    loadingObj
+  );
+}
+function postFindSyncOldTrayData(data, loadingObj = {}) {
+  return utils_request.service(
+    {
+      url: `logpm-warehouse/api/warehouseTrayType/findSyncOldTrayData`,
+      method: "post",
+      data
+    },
+    loadingObj
+  );
+}
+function postSyncOldTrayData(data, loadingObj = {}) {
+  return utils_request.service(
+    {
+      url: `logpm-warehouse/api/warehouseTrayType/syncOldTrayData`,
+      method: "post",
+      data
+    },
+    loadingObj
+  );
+}
 exports.$_initRetentionList = $_initRetentionList;
 exports.$_retentionScan = $_retentionScan;
 exports.$_retentionTrayScan = $_retentionTrayScan;
@@ -1551,11 +1651,14 @@ exports.deliverywrap = deliverywrap;
 exports.deliverywrapIn = deliverywrapIn;
 exports.dictbizdictionary = dictbizdictionary;
 exports.distributionOrderInfoInQuery = distributionOrderInfoInQuery;
+exports.distributionStockupgetStockupArea = distributionStockupgetStockupArea;
 exports.distributionStockuporderInfo = distributionStockuporderInfo;
 exports.distributionStockuporderList = distributionStockuporderList;
 exports.distributionStockuppageList = distributionStockuppageList;
+exports.distributionStockuppageListClient = distributionStockuppageListClient;
 exports.distributionStockupstockupScan = distributionStockupstockupScan;
 exports.distributionStockupstockupStockListPackageCode = distributionStockupstockupStockListPackageCode;
+exports.distributionStockupupdateStockArea = distributionStockupupdateStockArea;
 exports.distributionTrayDetail = distributionTrayDetail;
 exports.editPassword = editPassword;
 exports.getMyWarehouseList = getMyWarehouseList;
@@ -1576,16 +1679,23 @@ exports.pcontractQuestDetailList = pcontractQuestDetailList;
 exports.pgetContractList = pgetContractList;
 exports.pgetgetMaterialName = pgetgetMaterialName;
 exports.postAbnormalTruckLoading = postAbnormalTruckLoading;
+exports.postArriveUnloadCarsDetail = postArriveUnloadCarsDetail;
 exports.postArriveUnloadPageList = postArriveUnloadPageList;
 exports.postCarsLoadPageList = postCarsLoadPageList;
+exports.postCarsLoadUnloadPackage = postCarsLoadUnloadPackage;
+exports.postCarsLoadUnloadZero = postCarsLoadUnloadZero;
 exports.postFindAllAllocationId = postFindAllAllocationId;
 exports.postFindCarsLoadingDetail = postFindCarsLoadingDetail;
 exports.postFindCarsLoadingOrderDetail = postFindCarsLoadingOrderDetail;
+exports.postFindSyncOldTrayData = postFindSyncOldTrayData;
+exports.postFindUnloadTrayGoodsList = postFindUnloadTrayGoodsList;
 exports.postLoadingScan = postLoadingScan;
 exports.postLoadingTray = postLoadingTray;
 exports.postLoadingTrayInfo = postLoadingTrayInfo;
 exports.postLoadingZero = postLoadingZero;
 exports.postRemoveCarsLoadScan = postRemoveCarsLoadScan;
+exports.postSyncOldTrayData = postSyncOldTrayData;
+exports.postUnloadTray = postUnloadTray;
 exports.postWarehouseTaskAddDataInfo = postWarehouseTaskAddDataInfo;
 exports.postWarehouseTaskSelectPackageInfo = postWarehouseTaskSelectPackageInfo;
 exports.postZeroStockUp = postZeroStockUp;

unpackage/dist/dev/mp-weixin/app.js

@@ -21,6 +21,7 @@ if (!Math) {
   "./pagesHome/pages/RelayScanList/RelayScanList.js";
   "./pagesHome/pages/codePlateBracket/codePlateBracket.js";
   "./pagesHome/pages/ArrivalList/ArrivalList.js";
+  "./pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.js";
   "./pagesHome/pages/SelfPickupScan/SelfPickupScan.js";
   "./pagesHome/pages/LoadingScan/LoadingScan.js";
   "./pagesHome/pages/loadingRetention/loadingRetention.js";
@@ -58,6 +59,7 @@ if (!Math) {
   "./pagesHome/pages/Relocation/Relocation.js";
   "./pagesHome/pages/PeopleScanUpType/PeopleScanUpType.js";
   "./pagesHome/pages/PeopleScanUp/PeopleScanUp.js";
+  "./pagesHome/pages/PickingScanList/PickingScanList.js";
   "./pagesHome/pages/Retention/Retention.js";
   "./pagesHome/pages/MergeTray/MergeTray.js";
   "./pagesHome/pages/MergeTrayDetails/MergeTrayDetails.js";
@@ -73,6 +75,7 @@ if (!Math) {
   "./pagesHome/pages/orderInquiry/orderInquiry.js";
   "./pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.js";
   "./pagesHome/pages/StockUpListZero/StockUpListZero.js";
+  "./pagesHome/pages/SearchTray/SearchTray.js";
   "./pagesUser/pages/about/about.js";
   "./pagesUser/pages/systemSettings/systemSettings.js";
   "./pagesUser/pages/securitySettings/securitySettings.js";

unpackage/dist/dev/mp-weixin/config/host.js

@@ -1,5 +1,5 @@
 "use strict";
-const devhost = "http://192.168.10.25:13000/";
+const devhost = "https://h5uapi.huitongys.com/";
 const imghost = "";
 const host = devhost;
 const APPKEY = "h5u:h5u_secret";

unpackage/dist/dev/mp-weixin/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.js

@@ -102,7 +102,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         if (response.code !== 200)
           return;
         console.log("response", response);
-        details.datalist = response.data.records;
+        details.datalist = response.data;
       } catch (e) {
       } finally {
         return null;

unpackage/dist/dev/mp-weixin/pagesHome/pages/PickingScanList/PickingScanList.js

@@ -121,9 +121,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     }
     const { items, datalist } = common_vendor.toRefs(details);
     function backPreviousPage() {
-      common_vendor.index.redirectTo({
-        url: "/pagesHome/pages/pickingScan/pickingScan"
-      });
+      common_vendor.index.navigateBack();
     }
     return (_ctx, _cache) => {
       return common_vendor.e({

unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.js

@@ -188,7 +188,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       details.warehouseArea = response.data.warehouseArea;
       details.address = response.data.address;
       if (Number(details.scanNum) > 0 && details.isscan) {
-        utils_utils.utils.ttsspke("扫描" + details.scanNum + "件");
+        utils_utils.utils.ttsspke(details.scanNum + "件");
       }
     }
     const { dataList } = common_vendor.toRefs(details);