222

schangxiang@126.com

2024-12-12 9f61c92fe6864d536a0e3a6e041cbd788dcec752

222

 CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Inbound/2¡¢DataProcess_BZ39_IssueInboundTask.cs

@@ -86,6 +86,7 @@
                            }

                            doTask.TaskStatus = (int)TaskStatusEnum.已下发;
                            doTask.IssueTime = DateTime.Now;

                            wmsDB.SaveChanges();
                        }

 CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Outbound/2¡¢DataProcess_RobotBuffer_IssueOutboundTask.cs

@@ -140,6 +140,7 @@
                            }

                            doTask.TaskStatus = (int)TaskStatusEnum.已下发;
                            doTask.IssueTime = DateTime.Now;

                            wmsDB.SaveChanges();
                        }

 CC/iWareCC_ASRS/ThreadService/03_BZ12(»úÆ÷ÈËÂë°ü¹¤Î»)/2¡¢DataProcess_BZ12_IssueTask.cs

@@ -111,6 +111,7 @@
                            }

                            task.TaskStatus = (int)TaskStatusEnum.已下发;
                            task.IssueTime = DateTime.Now;

                            wmsDB.SaveChanges();
                        }

 CC/iWareCC_ASRS/ThreadService/04_BZ21£¨°áÔËÕû¶â»úÆ÷ÈË£©/2¡¢DataProcess_BZ21_IssueTask.cs

@@ -104,6 +104,7 @@
                            }

                            task.TaskStatus = (int)TaskStatusEnum.已下发;
                            task.IssueTime = DateTime.Now;

                            wmsDB.SaveChanges();
                        }

 LA24030_LuLiPackageLine_Pda/api/putIn/artificial.js

@@ -216,6 +216,13 @@
        data: data
     })
}
export function querySingleUpiByUpi(data){ 
    return request({
        url: `/api/WmsCommonnQuery/QuerySingleUpiByUpi`,
        method: 'post',
        data: data
     })
}

export function getenumDataList(data){ 
    return request({

 LA24030_LuLiPackageLine_Pda/pages.json

@@ -116,7 +116,7 @@
        }, {
            "path": "pages/artificial/artificial",
            "style": {
                "navigationBarTitleText": "入库",
                "navigationBarTitleText": "板件查看",
                "enablePullDownRefresh": false
            }
        },{
@@ -214,7 +214,7 @@
        }, {
            "path": "pages/takeMaterial/orderpiece/orderpiece",
            "style": {
                "navigationBarTitleText": "送货单收货",
                "navigationBarTitleText": "NG处理",
                "enablePullDownRefresh": false
            }


 LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue

@@ -93,6 +93,13 @@
                  </text>
                </u-col>
              </u-row>
              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
                    <text class="color_80"> æ¬¡åºï¼š{{ item.shelf }} </text>
                  </text>
                </u-col>
              </u-row>
              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
@@ -129,13 +136,13 @@
                  </text>
                </u-col>
              </u-row>
              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
                    <text class="color_80"> æ¬¡åºï¼š{{ item.shelf }} </text>
                  </text>
                </u-col>
              </u-row>
               <u-row>
                              <u-col span="12">
                                <text class="color_80 padding_left25rpx">
                                  æ ‡è®°ï¼š{{ getUpiFlagEnumName(item.upiFlag) }}
                                </text>
                              </u-col>
                            </u-row>
              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
@@ -301,7 +308,7 @@
import ButtonModal from "../../components/buttonModal.vue";
import ModalCode from "../../components/ModalCode.vue";
import {
  getBhbMaterialList,
  querySingleUpiByUpi,
  getenumDataList,
} from "../../api/putIn/artificial.js";
export default {
@@ -336,6 +343,7 @@
      kwbhAllowed: false,
      enumList: [],
      areaCodeEnum: [],
      upiFlagEnum: [],
    };
  },
  components: {
@@ -353,6 +361,11 @@
    }).then((res) => {
      this.areaCodeEnum = res.result || [];
    });
        getenumDataList({
          EnumName: "UpiFlagEnum",
        }).then((res) => {
          this.upiFlagEnum = res.result || [];
        });
  },
  onLoad() {
    this.operator = JSON.parse(uni.getStorageSync("userInfo")).name;
@@ -368,6 +381,10 @@
      const name = this.areaCodeEnum.find((item) => item.value === value);
      return name ? name.name : "";
    },
      getUpiFlagEnumName(value) {
          const name = this.upiFlagEnum.find((item) => item.value === value);
          return name ? name.name : "";
        },
    // å¦‚果打开一个的时候，不需要关闭其他，则无需实现本方法
    open(index) {
      // å…ˆå°†æ­£åœ¨è¢«æ“ä½œçš„swipeAction标记为打开状态，否则由于props的特性限制，
@@ -401,7 +418,7 @@
        });
        return;
      }
      getBhbMaterialList({
      querySingleUpiByUpi({
        packageCode: this.warehouse.packageCode,
        upi: this.warehouse.upi,
      }).then((res) => {

 LA24030_LuLiPackageLine_Pda/pages/login/login.vue

@@ -5,11 +5,11 @@
        </view>
        <view class="width height50">
            <view class="text_align_center fontSize56rpx ">
                æ ‡å‡†åŒ–原材料库
				
            </view>
            <view class="text_align_center margin_bottom18 "
                style="font-size: 40rpx;color: #9fa09f;padding: 25rpx 0 0;">
                â€”智能仓储系统—
                â€”鲁丽家居包装线—
            </view>
        <!--     <tki-barcode :loadMake="false" :opations="opations" :onval="true" format="code128" :val="val" ref="barcode"
                @result="barresult" /> -->

 LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue

@@ -93,6 +93,13 @@
                  </text>
                </u-col>
              </u-row>
              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
                    <text class="color_80"> æ¬¡åºï¼š{{ item.shelf }} </text>
                  </text>
                </u-col>
              </u-row>
              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
@@ -129,13 +136,13 @@
                  </text>
                </u-col>
              </u-row>
              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
                    <text class="color_80"> æ¬¡åºï¼š{{ item.shelf }} </text>
                  </text>
                </u-col>
              </u-row>
              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
                    æ ‡è®°ï¼š{{ getUpiFlagEnumName(item.upiFlag) }}
                  </text>
                </u-col>
              </u-row>
              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
@@ -304,7 +311,7 @@
import {
  WmsOperationTaskSetNG,
  WmsOperationTaskCancelNG,
  getBhbMaterialList,
  querySingleUpiByUpi,
  getenumDataList,
} from "@/api/putIn/artificial.js";

@@ -340,6 +347,7 @@
      kwbhAllowed: false,
      enumList: [],
      areaCodeEnum: [],
      upiFlagEnum: [],
    };
  },
  components: {
@@ -357,6 +365,11 @@
    }).then((res) => {
      this.areaCodeEnum = res.result || [];
    });
    getenumDataList({
      EnumName: "UpiFlagEnum",
    }).then((res) => {
      this.upiFlagEnum = res.result || [];
    });
  },
  onLoad() {
    this.operator = JSON.parse(uni.getStorageSync("userInfo")).name;
@@ -367,6 +380,10 @@
      const name = this.enumList.find((item) => item.value === value);
      return name ? name.name : "";
    },
    getUpiFlagEnumName(value) {
      const name = this.upiFlagEnum.find((item) => item.value === value);
      return name ? name.name : "";
    },
    getAreaCodeEnumName(value) {
      const name = this.areaCodeEnum.find((item) => item.value === value);
      return name ? name.name : "";
@@ -381,7 +398,7 @@
        });
        return;
      }
      getBhbMaterialList({
      querySingleUpiByUpi({
        upi: this.warehouse.upi,
      }).then((res) => {
        const result = res.result;

 LA24030_LuLiPackageLine_Pda/pages/untie/untie.vue

@@ -94,6 +94,13 @@
                  </text>
                </u-col>
              </u-row>
              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
                    <text class="color_80"> æ¬¡åºï¼š{{ item.shelf }} </text>
                  </text>
                </u-col>
              </u-row>
              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
@@ -130,13 +137,13 @@
                  </text>
                </u-col>
              </u-row>
              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
                    <text class="color_80"> æ¬¡åºï¼š{{ item.shelf }} </text>
                  </text>
                </u-col>
              </u-row>
               <u-row>
                              <u-col span="12">
                                <text class="color_80 padding_left25rpx">
                                  æ ‡è®°ï¼š{{ getUpiFlagEnumName(item.upiFlag) }}
                                </text>
                              </u-col>
                            </u-row>
              <u-row>
                <u-col span="12">
                  <text class="color_80 padding_left25rpx">
@@ -346,6 +353,7 @@
      kwbhAllowed: false,
      enumList: [],
      areaCodeEnum: [],
      upiFlagEnum: [],
    };
  },
  components: {
@@ -364,7 +372,11 @@
    }).then((res) => {
      this.areaCodeEnum = res.result || [];
    });

   getenumDataList({
         EnumName: "UpiFlagEnum",
       }).then((res) => {
         this.upiFlagEnum = res.result || [];
       });
  },
  onLoad() {
    this.operator = JSON.parse(uni.getStorageSync("userInfo")).name;
@@ -380,6 +392,10 @@
      const name = this.areaCodeEnum.find((item) => item.value === value);
      return name ? name.name : "";
    },
     getUpiFlagEnumName(value) {
          const name = this.upiFlagEnum.find((item) => item.value === value);
          return name ? name.name : "";
        },
    // å¦‚果打开一个的时候，不需要关闭其他，则无需实现本方法
    open(index) {
      // å…ˆå°†æ­£åœ¨è¢«æ“ä½œçš„swipeAction标记为打开状态，否则由于props的特性限制，

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs

@@ -687,7 +687,7 @@
            throw Oops.Oh("参数不能为空");
        }

        var singleUpi = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.UPI == input.Upi).FirstAsync();
        var singleUpi = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.UPI == input.Upi || x.PackageCode == input.Upi).FirstAsync();
        if (singleUpi == null)
        {
            throw Oops.Oh($"没有找到部件条码{input.Upi}的数据");
@@ -700,7 +700,35 @@
        }

        var upiList = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.PackageCode == singleUpi.PackageCode).ToListAsync();
        upiList = upiList.OrderBy(x => x.Shelf).ToList();

        return upiList;
    }


    /// <summary>
    /// æ ¹æ®æŸä¸ªUpi，查询板件数据
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "QuerySingleUpiByUpi")]
    [Description("WmsCommonnQuery/QuerySingleUpiByUpi")]
    public async Task<List<Mes_BatchOrderUPI_New>> QuerySingleUpiByUpi(QueryUpiListByUpiInput input)
    {
        if (input == null || input.Upi == null)
        {
            throw Oops.Oh("参数不能为空");
        }

        var singleUpi = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.UPI == input.Upi).FirstAsync();
        if (singleUpi == null)
        {
            throw Oops.Oh($"没有找到部件条码{input.Upi}的数据");
        }

        List<Mes_BatchOrderUPI_New> upiList = new List<Mes_BatchOrderUPI_New>();
        upiList.Add(singleUpi);
        return upiList;
    }

@@ -783,10 +811,10 @@
                {
                    Time = 12 - i,
                    InWare = recordsOfDay
                   // .Where(x => x.OrderType == OrderTypeEnum.上架单)
                    // .Where(x => x.OrderType == OrderTypeEnum.上架单)
                    .ToList().Count(),
                    OutWare = recordsOfDay
                  //  .Where(x => x.OrderType == OrderTypeEnum.下架单)
                    //  .Where(x => x.OrderType == OrderTypeEnum.下架单)
                    .ToList().Count(),
                    StockNum = 0,
                    AveStockNum = 0,
@@ -803,8 +831,8 @@
            DateTime all_startDate = GetStartOfWeek(currentDate).AddDays(-7 * 11);
            DateTime all_endDate = GetEndOfWeek(currentDate);
            var all_recordsOfDay = await _mesOrderGatherRep.AsQueryable().Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
                //&& (r.OrderStatus == OrderStatusEnum.已完成)
                //&& (r.OrderType == OrderTypeEnum.上架单 || r.OrderType == OrderTypeEnum.下架单)
               //&& (r.OrderStatus == OrderStatusEnum.已完成)
               //&& (r.OrderType == OrderTypeEnum.上架单 || r.OrderType == OrderTypeEnum.下架单)
               ).ToListAsync();

            for (int i = 0; i < 12; i++)
@@ -841,8 +869,8 @@
            DateTime all_startDate = currentDate.AddMonths(-11).AddDays(1 - currentDate.Day);
            DateTime all_endDate = currentDate.AddMonths(1).AddDays(-1);
            var all_recordsOfDay = await _mesOrderGatherRep.AsQueryable().Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
                //&& (r.OrderStatus == OrderStatusEnum.已完成)
                //&& (r.OrderType == OrderTypeEnum.上架单 || r.OrderType == OrderTypeEnum.下架单)
               //&& (r.OrderStatus == OrderStatusEnum.已完成)
               //&& (r.OrderType == OrderTypeEnum.上架单 || r.OrderType == OrderTypeEnum.下架单)
               ).ToListAsync();

            for (int i = 0; i < 12; i++)
@@ -890,6 +918,6 @@
    {
        return startDate.AddDays(6); // å› ä¸ºèµ·å§‹æ—¥æœŸå·²ç»æ˜¯å‘¨ä¸€ï¼Œæ‰€ä»¥ç›´æŽ¥åŠ 6天即可得到周日
    }
  

}