修改PDA入WMS平库

dengjunjie

2025-01-17 05decba90504212f52778db6129b09935f4fe6a2

修改PDA入WMS平库

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs

@@ -21,7 +21,7 @@
        WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, string serNum);

        WebResponseContent InPinKu(string inboundOrderId,int warehouseId, List<string> serNums);
        WebResponseContent InPinKu(int warehouseId, List<string> serNums);
        WebResponseContent WMSInPinKu(int warehouseId, List<string> serNums);
        WebResponseContent MaterielGroup(string palletCode, int Initiallife, int warehouseId, List<string> serNums);

        //WebResponseContent FeedbackInboundOrder(int id);

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

@@ -429,7 +429,7 @@
        /// <param name="warehouseId"></param>
        /// <param name="serNums"></param>
        /// <returns></returns>
        public WebResponseContent InPinKu(int warehouseId, List<string> serNums)
        public WebResponseContent WMSInPinKu(int warehouseId, List<string> serNums)
        {
            WebResponseContent content = new WebResponseContent();
            try
@@ -472,6 +472,7 @@
                        SerialNumber = model.SerialNumber,
                        StockQuantity = model.Quantity,
                        OutboundQuantity = 0,
                        OrderNo = "",
                        Unit = materielInfo.MaterielUnit,
                        Status = StockStatusEmun.入库完成.ObjToInt(),
                        ProductionDate = model.ProductionDate,
@@ -846,7 +847,7 @@
                List<ERPInboundDetailModel>? detailModels = new List<ERPInboundDetailModel>();
                foreach (var stockInfo in stockInfos)
                {
                    foreach (var item in stockInfo.Details.GroupBy(x=>x.InboundOrderRowNo).Select(x=>x.Key))
                    foreach (var item in stockInfo.Details.GroupBy(x => x.InboundOrderRowNo).Select(x => x.Key))
                    {
                        //区分不同批次
                        Dt_StockInfoDetail? dt_StockInfoDetail = stockInfo.Details.Where(x => x.InboundOrderRowNo == item).FirstOrDefault();

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

@@ -146,7 +146,7 @@
                    Way = 1,
                    Details = recevieOrderDetails
                };
                

                //更新收货单信息
                receiveOrder.ReceiveOrderStatus = ReceiveOrderStatusEnum.Completed.ObjToInt();
                receiveOrder.UploadStatus = WhetherEnum.True.ObjToInt();
@@ -235,7 +235,7 @@
                    SupplierId = receiveOrder.SuppliersId,
                    Details = new List<Dt_InboundOrderDetail>()
                };

                List<Dt_MaterielInfo> materielCodeInfos = _basicRepository.MaterielInfoRepository.QueryData(x => receiveOrder.Details.Select(x => x.MaterielCode).ToList().Contains(x.MaterielCode));
                foreach (var item in receiveOrder.Details)
                {
                    float quantity = item.ReceivedQuantity;
@@ -253,6 +253,7 @@
                    Dt_InboundOrderDetail detail = new Dt_InboundOrderDetail()
                    {
                        MaterielCode = item.MaterielCode,
                        MaterielName = materielCodeInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "",
                        OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
                        OrderQuantity = quantity,
                        OverInQuantity = 0,

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrderDetail.cs

@@ -33,6 +33,12 @@
        public string MaterielCode { get; set; }

        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "物料名称")]
        public string MaterielName { get; set; }

        /// <summary>
        /// æ‰¹æ¬¡å·
        /// </summary>
        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "批次号")]

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs

@@ -47,10 +47,10 @@
        /// <param name="warehouseId"></param>
        /// <param name="serNums"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("InPinKu")]
        public WebResponseContent InPinKu(int warehouseId, [FromBody] List<string> serNums)
        [HttpPost, HttpGet, Route("WMSInPinKu")]
        public WebResponseContent WMSInPinKu(int warehouseId, [FromBody] List<string> serNums)
        {
            return Service.InPinKu(warehouseId, serNums);
            return Service.WMSInPinKu(warehouseId, serNums);
        }
        /// <summary>
        /// å•ä¸ªç‰©æ–™ç ç»„盘

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

@@ -64,8 +64,8 @@
                                placeholder="请扫描托盘条码" ref='midInput' @input="inputChangebarcode" />
                        </uni-forms-item>
                        <uni-forms-item label="地址条码">
                            <uni-easyinput type="text" v-model="address" :disabled="addressdisabled" placeholder="请扫描地址条码" ref='midInput'
                                :focus="addressFocus" />
                            <uni-easyinput type="text" v-model="address" :disabled="addressdisabled"
                                placeholder="请扫描地址条码" ref='midInput' :focus="addressFocus" />
                        </uni-forms-item>
                        <uni-forms-item>
                            <button @click="inbound" type="primary" size="default" style="margin-top: 2%;">入库确认</button>
@@ -101,26 +101,6 @@
                </view>
            </view>
            <view v-if="current === 2" class="headerstyle">
                <view class="itemstyle">
                    <uni-list :border="true">
                        <uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="index">
                            <template v-slot:body>
                                <view class="uni-list-box">
                                    <view class="uni-content">
                                        <view style="font-size: 18px;">单据号：{{orderNo}}</view>
                                        <view style="font-size: 18px;">物料编码：{{item.materielCode}}</view>
                                        <!-- <view style="font-size: 18px;">物料名称：{{item.matName}}</view> -->
                                        <view style="font-size: 18px;">数量：{{item.orderQuantity}}</view>
                                        <view style="font-size: 18px;">单位：{{item.unit}}</view>
                                        <view style="font-size: 18px;">组盘数量：{{item.receiptQuantity}}</view>
                                    </view>
                                </view>
                            </template>
                        </uni-list-item>
                    </uni-list>
                </view>
            </view>
            <view v-if="current === 3" class="headerstyle">
                <view class="itemstyle">
                    <uni-forms label-width="180">
                        <uni-forms-item label="内箱标签:">
@@ -189,8 +169,8 @@
                Testlabel: "",
                Testplaceholder: "",
                Testcheck: false,
                Summmary:0,
                stockInfoDetail:[],
                Summmary: 0,
                stockInfoDetail: [],
                addressdisabled: false,
                pksns: [],
                pkmaterSn: "",
@@ -217,7 +197,7 @@
                this.items.push("入平库");
                this.items[1] = "入立库";
                this.address = "8005";
            }else if (this.warehouseId == 3) { //辅料仓库区ID
            } else if (this.warehouseId == 3) { //辅料仓库区ID
                this.address = "1011";
                this.addressdisabled = true;
            }
@@ -238,8 +218,9 @@
                    })
                    return;
                }
                this.$u.post('/api/InboundOrder/InPinKu?warehouseId=' + this.warehouseId, this
                this.$u.post('/api/InboundOrder/WMSInPinKu?warehouseId=' + this.warehouseId, this
                    .pksns).then(res => {
                    debugger
                    if (res.status) {
                        this.$refs.uToast.show({
                            title: "入库成功",
@@ -443,19 +424,20 @@
                    }
                    if (this.materSn != "") {
                        this.focus = false;
                        if(this.materSn.split(',').length != 6){
                        if (this.materSn.split(',').length != 6) {
                            this.materSn = "";
                            return;
                        }
                        var matSn = this.materSn;
                        //setTimeout(() => {
                            this.materSn = "";
                        this.materSn = "";
                        //}, 10);
                        this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
                            this.Testcheck = false;
                            if (res.status) {
                                this.sns.push(res.data.serialNumber);
                                if (this.warehouseId == 6 || this.warehouseId == 2 || this.warehouseId == 3) {
                                if (this.warehouseId == 6 || this.warehouseId == 2 || this.warehouseId ==
                                    3) {
                                    if (this.matInfos.length > 0) {
                                        this.matInfos = [];
                                    }
@@ -552,12 +534,12 @@
                            // this.stockInfo = [];
                            this.stockInfoDetail = [];
                            if (res.status) {
                                    // this.stockInfo = res.data,
                                    this.stockInfoDetail = res.data.details
                                    //获取总数量
                                    this.stockInfoDetail.forEach(item => {
                                        this.Summmary+= item.stockQuantity;
                                    });
                                // this.stockInfo = res.data,
                                this.stockInfoDetail = res.data.details
                                //获取总数量
                                this.stockInfoDetail.forEach(item => {
                                    this.Summmary += item.stockQuantity;
                                });
                            } else {
                                this.$refs.uToast.show({
                                    // title: "未找到托盘信息",