Quellcode durchsuchen

手持-拣货调整接口和入参

zhaohuanhuan vor 2 Tagen
Ursprung
Commit
56455bf869
3 geänderte Dateien mit 69 neuen und 27 gelöschten Zeilen
  1. 1 1
      src/api/picking/index.ts
  2. 53 7
      src/types/picking.ts
  3. 15 19
      src/views/outbound/picking/task/index.vue

+ 1 - 1
src/api/picking/index.ts

@@ -45,7 +45,7 @@ export function getBigPickingTaskDetail(data:getBigPickingTaskDetailType) {
  */
 export function createPickingTask(data: createPickingTaskType) {
   return request({
-    url: 'api/wms/picking/build-by-owner',
+    url: 'api/wms/picking-tasks/outbound',
     method: 'post',
     data:JSON.stringify(data)
   })

+ 53 - 7
src/types/picking.ts

@@ -46,13 +46,59 @@ export interface getBigPickingTaskDetailType {
  * @param warehouseAttributeList 属性仓
  */
 export interface createPickingTaskType {
-  uid: undefined;
-  count: number;
-  owners: string[] | undefined;
-  carriers: any[];
-  warehouse: string;
-  type: any;
-  orderNoList: any[];
+  /**
+   * 仓库编号
+   */
+  warehouse?: string;
+  /**
+   * 货主集合
+   */
+  customerCodes?: string[];
+  /**
+   * 承运商编号列表
+   */
+  carrierCodes?: string[];
+  /**
+   * 货主编号
+   */
+  customerCode?: string;
+  /**
+   * 店铺名称集合
+   */
+  issuePartyNames?: string[];
+  /**
+   * 订单号(单个订单指定拣货)
+   */
+  orderNo?: string;
+  /**
+   * 订单类型:Y-单品,N-普通,M-大件,U-加急,S-特殊
+   */
+  orderType?: OrderType;
+  /**
+   * 省份集合
+   */
+  provinces?: string[];
+  /**
+   * 订单数量
+   */
+  quantity?: number;
+  /**
+   * 订单备注
+   */
+  remark?: string;
+  /**
+   * 商品SKU集合
+   */
+  skus?: string[];
+  /**
+   * 活动订单UID集合(活动单批量拣货使用),key为活动UID,value为数量
+   */
+  uidMap?: { [key: string]: number };
+  /**
+   * 属性仓集合
+   */
+  warehouseAttributes?: string[];
+  [property: string]: any;
 }
 /**
  * 获取首个拣货任务

+ 15 - 19
src/views/outbound/picking/task/index.vue

@@ -360,9 +360,9 @@ const queryOwnerTask= ()=>{
 const _createPickingTask=(uidMap)=>{
   const params = {
     warehouse,
-    type:'*',
+    orderType:'*',
     uidMap,
-    enableFlag:false
+    enableMixingProhibition:false
   }
   showLoading()
   createPickingTask(params).then(res => {
@@ -505,32 +505,28 @@ const countRefFocus=()=>{
 }
 const createPicking = () => {
   const splitStringIfExists = value => (typeof value === 'string' && value.trim() !== '') ? value.split(',') : undefined;
-  let carriers = [];
   let orderNoList = [];
   let counts: number = count.value;
-
+  let uidMap = {}
   if (['S', 'U', 'M'].includes(model.value.type)) {
     orderNoList = checkedResult.value.map(item => item.orderNo);
-    carriers = [...new Set(checkedResult.value.map(item => item.carrier))];
     counts = orderNoList.length
   }else if(model.value.type=='*'){
-    orderNoList=subModel.value.orderNoList
-    carriers = [...new Set(checkedResult.value.map(item => item.carrier))];
-  } else {
-    orderNoList=model.value.matchedOrderNoList
-    carriers = subModel.value.carrierf
-      ? splitStringIfExists(subModel.value.carrier)
-      : splitStringIfExists(model.value.carrier);
+    uidMap={[subModel.value.uid]:counts}
   }
   const params = {
     warehouse,
-    owners: splitStringIfExists(model.value.owner),
-    carriers,
-    type: model.value.type,
-    uid: subModel.value.uid || undefined,
-    orderNoList,
-    count: counts,
-    // uidMap:Object.keys(uidMap).length !== 0?uidMap:undefined,
+    customerCode: splitStringIfExists(model.value.owner)[0],
+    carrierCodes:splitStringIfExists(model.value.carrier),
+    warehouseAttribute:splitStringIfExists(model.value.warehouseAttribute),
+    issuePartyNames:splitStringIfExists(model.value.issuePartyNames),
+    skus:splitStringIfExists(model.value.skus),
+    orderType: model.value.type,
+    uidMap:  Object.keys(uidMap).length > 0 ? uidMap : undefined,
+    quantity: counts,
+    remark:model.value.remark,
+    orderNos:orderNoList.length>0?orderNoList:undefined,
+    provinces:splitStringIfExists(model.value.provinces),
   }
   showLoading()
   createPickingTask(params).then(res => {