Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

hutongqing

2024-12-28 04a831b2a945b9b6bcb659038a6fed1d3148e3ce

Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs

@@ -95,7 +95,7 @@
                {
                    return WebResponseContent.Instance.Error($"未找到收货单");
                }
                if (receiveOrder.ReceiveOrderStatus==ReceiveOrderStatusEnum.Completed.ObjToInt())
                if (receiveOrder.ReceiveOrderStatus == ReceiveOrderStatusEnum.Completed.ObjToInt())
                {
                    return WebResponseContent.Instance.Error($"收货单已完成");
                }
@@ -126,7 +126,7 @@
                        Serno = item.RowNo,
                        Supplotno = "",
                        Taxrate = "",
                        

                    };
                    recevieOrderDetails.Add(recevieOrderDetail);
                }
@@ -142,7 +142,7 @@
                    ReceiveDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                    PlantsId = "HA02",
                    SuppliersId = receiveOrder.SuppliersId,
                    Type = Enum.GetName(typeof(ReceiveOrderTypeEnum),receiveOrder.ReceiveOrderType),
                    Type = Enum.GetName(typeof(ReceiveOrderTypeEnum), receiveOrder.ReceiveOrderType),
                    UniqueTag = receiveOrder.ReceiveOrderId.ToString(),
                    WarehouseCode = warehouse.WarehouseCode,
                    Way = 1,
@@ -150,8 +150,8 @@
                };
                //收货推送至ERP
                string Content = _invokeERPService.InvokeMatReceiveApi(receiveModel);
                ErpRequestContent erpRequest=Content.DeserializeObject<ErpRequestContent>();
                if (erpRequest.res==0)
                ErpRequestContent erpRequest = Content.DeserializeObject<ErpRequestContent>();
                if (erpRequest.res == 0)
                {
                    return WebResponseContent.Instance.Error(erpRequest.Data);
                }
@@ -173,15 +173,16 @@
            try
            {
                int pageNo = saveModel.MainData["pageNo"].ObjToInt();
                int warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
                string orderNo = saveModel.MainData["orderNo"].ToString();
                List<Dt_ReceiveOrder> dt_ReceiveOrders = new List<Dt_ReceiveOrder>();
                if (string.IsNullOrEmpty(orderNo))
                {
                    dt_ReceiveOrders = Db.Queryable<Dt_ReceiveOrder>().Where(x => x.ReceiveOrderStatus < ReceiveOrderStatusEnum.Completed.ObjToInt()).ToPageList(pageNo, 5);
                    dt_ReceiveOrders = Db.Queryable<Dt_ReceiveOrder>().Where(x => x.ReceiveOrderStatus < ReceiveOrderStatusEnum.Completed.ObjToInt() && x.WarehouseId == warehouseId).ToPageList(pageNo, 5);
                }
                else
                {
                    dt_ReceiveOrders = Db.Queryable<Dt_ReceiveOrder>().Where(x => (x.ReceiveOrderNo.Contains(orderNo) || x.SuppliersId.Contains(orderNo)) && x.ReceiveOrderStatus < ReceiveOrderStatusEnum.Completed.ObjToInt()).ToPageList(pageNo, 5);
                    dt_ReceiveOrders = Db.Queryable<Dt_ReceiveOrder>().Where(x => (x.ReceiveOrderNo.Contains(orderNo) || x.SuppliersId.Contains(orderNo)) && x.ReceiveOrderStatus < ReceiveOrderStatusEnum.Completed.ObjToInt() && x.WarehouseId == warehouseId).ToPageList(pageNo, 5);
                }

                content.OK(data: dt_ReceiveOrders);
@@ -230,7 +231,7 @@

                Dt_InboundOrder inboundOrder = new Dt_InboundOrder()
                {
                    InboundOrderNo="TestInboundNo21",//测试
                    InboundOrderNo = "TestInboundNo21",//测试
                    UpperOrderNo = receiveOrder.ReceiveOrderNo,
                    CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
                    OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
@@ -352,7 +353,7 @@
                    }
                    receiveOrder = new Dt_ReceiveOrder()
                    {
                        ReceiveOrderNo= "TestReceiveOrderNo21",//测试
                        ReceiveOrderNo = "TestReceiveOrderNo21",//测试
                        ReceiveOrderStatus = ReceiveOrderStatusEnum.Receiving.ObjToInt(),
                        CustomerId = "",
                        DeliveryCode = "/",

 ´úÂë¹ÜÀí/»´°²PDA/pages.json

@@ -77,404 +77,6 @@
                "navigationBarTitleText": "收货单",
                "enablePullDownRefresh": false
            }
        },
        // {
        //     "path": "pages/materielGroup/inboundOrder",
        //     "style": {
        //         "navigationBarTitleText": "入库订单",
        //         "enablePullDownRefresh": false
        //     }
        // },
        //原材料组盘(订单)
        {
            "path": "pages/raworderboxing/inboundorder",
            "style": {
                "navigationBarTitleText": "入库订单",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/raworderboxing/orderboxing",
            "style": {
                "navigationBarTitleText": "组盘",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/raworderboxing/releaseboxing",
            "style": {
                "navigationBarTitleText": "解绑托盘",
                "enablePullDownRefresh": false
            }
        },
        //其他组盘
        {
            "path": "pages/otherboxing/otherboxing",
            "style": {
                "navigationBarTitleText": "其他组盘",
                "enablePullDownRefresh": false
            }
        },
		
        //成品组盘
        {
            "path": "pages/productboxing/productboxing",
            "style": {
                "navigationBarTitleText": "成品组盘",
                "enablePullDownRefresh": false
            }
        },
		
        //手动出库管理
        {
            "path": "pages/rawhandoutbound/rawhandoutbound",
            "style": {
                "navigationBarTitleText": "原料手动出库",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/rawhandoutbound/handoutbound",
            "style": {
                "navigationBarTitleText": "ZB手动出库",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/rawhandoutbound/kbhandoutbound",
            "style": {
                "navigationBarTitleText": "KB手动出库",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/rawhandoutbound/manualoutbound",
            "style": {
                "navigationBarTitleText": "栈板区指定出库",
                "enablePullDownRefresh": false
            }
        },
		
        //成品出库
        {
            "path": "pages/productoutbound/productoutbound",
            "style": {
                "navigationBarTitleText": "成品出库",
                "enablePullDownRefresh": false
            }
        },
		
        //半成品组盘
        {
            "path": "pages/halfproduct/hpreceiveorder",
            "style": {
                "navigationBarTitleText": "半成品组盘",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/halfproduct/halfproductboxing",
            "style": {
                "navigationBarTitleText": "半成品组盘",
                "enablePullDownRefresh": false
            }
        },
		
        //生产领料单(仓库手动备料)
        {
            "path": "pages/receiveorder/receiveorder",
            "style": {
                "navigationBarTitleText": "收货单",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/receiveorder/multiplereceiveorder",
            "style": {
                "navigationBarTitleText": "生产领料单(多)",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/receiveorder/multiplereceiveorderout",
            "style": {
                "navigationBarTitleText": "生产领料单(多)",
                "enablePullDownRefresh": false
            }
        },
		
        //调拨申请单(仓库手动备料)
        {
            "path": "pages/allocationorder/allocationorder",
            "style": {
                "navigationBarTitleText": "调拨申请单",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/allocationorder/allocationorderoutbound",
            "style": {
                "navigationBarTitleText": "调拨申请单",
                "enablePullDownRefresh": false
            }
        },
		
        //直接调拨单(仓库手动备料)
        {
            "path": "pages/directorder/directorder",
            "style": {
                "navigationBarTitleText": "直接调拨单",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/directorder/directorderoutbound",
            "style": {
                "navigationBarTitleText": "直接调拨单",
                "enablePullDownRefresh": false
            }
        },
		
        //其他出库单(仓库手动备料)
        {
            "path": "pages/otheroutboundorder/otheroutboundorder",
            "style": {
                "navigationBarTitleText": "其他出库单",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/otheroutboundorder/otherorderoutbound",
            "style": {
                "navigationBarTitleText": "其他出库单",
                "enablePullDownRefresh": false
            }
        },
		
        //移库管理
        {
            "path": "pages/relocation/relocation",
            "style": {
                "navigationBarTitleText": "移库",
                "enablePullDownRefresh": false
            }
        },
		
        //空箱管理
        {
            "path": "pages/emptybox/emptyboxmanage",
            "style": {
                "navigationBarTitleText": "空箱管理",
                "enablePullDownRefresh": false
            }
        },
		
        //拣选管理
        {
            "path": "pages/picking/pickingMat",
            "style": {
                "navigationBarTitleText": "拣选",
                "enablePullDownRefresh": false
            }
        },
		
        //生产叫料管理
        {
            "path": "pages/callmat/receiveorder",
            "style": {
                "navigationBarTitleText": "生产叫料",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/callmat/ordercallmat",
            "style": {
                "navigationBarTitleText": "生产叫料",
                "enablePullDownRefresh": false
            }
        },
		
		
        //配送管理
        {
            "path": "pages/delivery/delivery",
            "style": {
                "navigationBarTitleText": "配送管理",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/delivery/getcarryinfo",
            "style": {
                "navigationBarTitleText": "配送信息查询",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/delivery/carrycheck",
            "style": {
                "navigationBarTitleText": "配送校验",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/delivery/trainstockbind",
            "style": {
                "navigationBarTitleText": "小火车库存绑定",
                "enablePullDownRefresh": false
            }
        },
		
        //C区管理
        {
            "path": "pages/carea/carea",
            "style": {
                "navigationBarTitleText": "C区管理",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/carea/zbareaboxing",
            "style": {
                "navigationBarTitleText": "C区组盘",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/carea/cacheareacallmat",
            "style": {
                "navigationBarTitleText": "C区叫料",
                "enablePullDownRefresh": false
            }
        },
		
		
        //库存管理
        {
            "path": "pages/stock/stock",
            "style": {
                "navigationBarTitleText": "库存管理",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/stock/bindstock",
            "style": {
                "navigationBarTitleText": "库存绑定",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/stock/releasestock",
            "style": {
                "navigationBarTitleText": "库存解绑",
                "enablePullDownRefresh": false
            }
        },
		
        //出库扫描
        {
            "path": "pages/outboundscan/matoutboundscan",
            "style": {
                "navigationBarTitleText": "原材料出库扫描",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/outboundscan/productoutboundscan",
            "style": {
                "navigationBarTitleText": "成品出库扫描",
                "enablePullDownRefresh": false
            }
        },
		
        //内箱拆分
        {
            "path": "pages/other/other",
            "style": {
                "navigationBarTitleText": "内箱拆分",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/other/printtag",
            "style": {
                "navigationBarTitleText": "内箱拆分(F2)",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/other/printtagf4",
            "style": {
                "navigationBarTitleText": "内箱拆分(F4)",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/other/printtagf7",
            "style": {
                "navigationBarTitleText": "内箱拆分(F7)",
                "enablePullDownRefresh": false
            }
        },
		
        //叫料请求
        {
            "path": "pages/carry/getCarryRequest",
            "style": {
                "navigationBarTitleText": "叫料请求",
                "enablePullDownRefresh": false
            }
        },
		
        //取消任务
        {
            "path": "pages/taskInfo/cancelTask",
            "style": {
                "navigationBarTitleText": "取消任务",
                "enablePullDownRefresh": false
            }
        },
		
        //点对点
        {
            "path": "pages/test/qianfushitest",
            "style": {
                "navigationBarTitleText": "点对点任务",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/test/acrossfloor",
            "style": {
                "navigationBarTitleText": "跨楼层搬运",
                "enablePullDownRefresh": false
            }
        },
		
        //设置
        {
            "path": "pages/index/settings",
            "style": {
                "navigationBarTitleText": "设置",
                "enablePullDownRefresh": false
            }
        },
		
        //跨楼层叫料
        {
            "path": "pages/acrossfloor/matbind",
            "style": {
                "navigationBarTitleText": "跨楼层叫料绑定",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/acrossfloor/acrossfloorcallmat",
            "style": {
                "navigationBarTitleText": "跨楼层叫料",
                "enablePullDownRefresh": false
            }
        }
    ],
    "globalStyle": {

 ´úÂë¹ÜÀí/»´°²PDA/pages/acrossfloor/acrossfloorcallmat.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/acrossfloor/matbind.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/allocationorder/allocationorder.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/allocationorder/allocationorderoutbound.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/callmat/ordercallmat.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/callmat/receiveorder.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/carea/cacheareacallmat.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/carea/carea.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/carea/zbareaboxing.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/carry/getCarryRequest.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/delivery/carrycheck.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/delivery/delivery.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/delivery/getcarryinfo.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/delivery/trainstockbind.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/directorder/directorder.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/directorder/directorderoutbound.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/emptybox/emptyboxmanage.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/halfproduct/halfproductboxing.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/halfproduct/hpreceiveorder.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/index/settings.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/other/other.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/other/printtag.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/other/printtagf4.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/other/printtagf7.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/otherboxing/otherboxing.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/otheroutboundorder/otherorderoutbound.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/otheroutboundorder/otheroutboundorder.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/outboundscan/matoutboundscan.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/outboundscan/productoutboundscan.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/picking/pickingMat.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/productboxing/productboxing.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/productoutbound/productoutbound.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/rawhandoutbound/handoutbound.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/rawhandoutbound/kbhandoutbound.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/rawhandoutbound/manualoutbound.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/rawhandoutbound/rawhandoutbound.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/raworderboxing/inboundorder.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/raworderboxing/orderboxing.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/raworderboxing/raworderboxing.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/raworderboxing/releaseboxing.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/receiveorder/multiplereceiveorder.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/receiveorder/multiplereceiveorderout.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/receiveorder/receiveorder.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/receiveorder/receiveorderoutbound.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/relocation/relocation.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/stash/printingink/index.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/stash/receiveorder.vue

@@ -33,6 +33,7 @@
                page: "/pages/stash/receiveorderoutbound?orderNo=",
                loadVisible: false,
                searchValue: "",
                warehouseId: "",
                status: "more",
                allReceivingOrders: [],
                pageNo: 1,
@@ -40,6 +41,7 @@
            }
        },
        onLoad(res) {
            this.warehouseId = res.warehouseId;
            this.getData();
        },
        onPageScroll(e) {
@@ -61,7 +63,8 @@
                var postData = {
                    MainData: {
                        orderNo: this.searchValue,
                        pageNo: this.pageNo
                        pageNo: this.pageNo,
                        warehouseId: this.warehouseId,
                    },
                }
                this.$u.post('/api/ReceiveOrder/GetReceiveOrders', postData).then((res) => {

 ´úÂë¹ÜÀí/»´°²PDA/pages/stock/bindstock.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/stock/releasestock.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/stock/stock.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/taskInfo/cancelTask.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/template/tabtemplate.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/test/acrossfloor.vue

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/»´°²PDA/pages/test/qianfushitest.vue

ÎļþÒÑɾ³ý