yu.jie há 4 anos atrás
pai
commit
1e4f9ddcd2

+ 0 - 1
src/services/go/ermcp/warehouse-info/index.ts

@@ -14,7 +14,6 @@ import {
  */
 export function QueryWareHouse(status: string): Promise<ErmcpWareHouseInfo[]> {
     const userid = getUserId()
-    debugger
     return commonSearch_go('/Ermcp/QueryWarehouseInfo', { userid, status }).catch((err) => {
         throw new Error(`查询仓库信息: ${err.message}`);
     });

+ 1 - 0
src/services/proto/warehouse/index.ts

@@ -58,5 +58,6 @@ export const ermcpInOutStockApplyReq = (param: ERMCPAreaInOutStockApplyReq): Pro
     param.UserID = getUserId()
     param.ApplySrc = 2
     param.ApplyId = Number(getLongTypeLoginID())
+    debugger
     return protoMiddleware<ERMCPAreaInOutStockApplyReq>(param, 'ERMCPAreaInOutStockApplyReq', 'ERMCPAreaInOutStockApplyRsp', 2)
 }

+ 2 - 2
src/views/search/inventory/components/add/index.vue

@@ -96,7 +96,7 @@
               <a-select-option v-for="option in wareHouseList"
                                :key="option.autoid"
                                :value="option.autoid">
-                {{option.warehousename}}
+                {{option.warehousecode}}
               </a-select-option>
             </a-select>
           </a-form-item>
@@ -151,7 +151,7 @@ export default defineComponent({
                     // SpotGoodsModelID: param.S; // uint64 现货型号ID
                     SpotGoodsBrandID: param.SpotGoodsBrandID as number, // uint64 现货品牌ID
                     DeliveryGoodsID: param.DeliveryGoodsID as number, // uint64 现货品种ID
-                    // SpotContractID: param.SpotContractID as number, // uint64 关联现货合同ID [1:采购入库 2:销售出库 ](1,2状态必填)
+                    // SpotContractID: param.SpotContractID, // uint64 关联现货合同ID [1:采购入库 2:销售出库 ](1,2状态必填)
                     WarehouseInfo: param.WarehouseInfo as number, // uint64 现货仓库ID
                     Qty: Number(param.Qty), // double 数量
                     ApplyRemark: "", // string 申请备注

+ 4 - 4
src/views/search/inventory/components/add/setup.ts

@@ -13,7 +13,7 @@ export function handleFormState() {
     const formRef = ref();
     function initFormData(): FormState {
         return {
-            InOutType: 3, // int32 出入库类型 - 1:采购入库 2:销售出库 3:生产入库 4:生产出库
+            InOutType: 7, // int32 出入库类型 - 1:采购入库 2:销售出库 3:生产入库 4:生产出库
             WRStandardID: undefined, // uint64 现货商品ID
             SpotGoodsBrandID: undefined, // uint64 现货品牌ID
             DeliveryGoodsID: undefined, // uint64 现货品种ID
@@ -35,8 +35,8 @@ export function handleFormState() {
 // 仓库类别
 export function handleWarehouseType(formState: UnwrapRef<FormState>) {
     const warehouseType = [
-        { name: '生产入库', key: 3 },
-        { name: '生产出库', key: 4 },
+        { name: '生产入库', key: 7 },
+        { name: '生产出库', key: 8 },
     ]
     /**
      * 
@@ -44,7 +44,7 @@ export function handleWarehouseType(formState: UnwrapRef<FormState>) {
      * @return true: 入库; false:出库
      */
     function isIn(): boolean {
-        return formState.InOutType === 3
+        return formState.InOutType === 7
     }
     function inOrOut() {
         return isIn() ? '入库' : '出库'