yanjinhui
9 天以前 60a50d7a976f33a172421546fd891f33a21043e5
优化
已修改8个文件
25 ■■■■■ 文件已修改
新建文件夹/PDA/pages/stash/CheckoutorderDetail.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
新建文件夹/PDA/pages/stash/inboundorderDetail.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
新建文件夹/PDA/pages/stash/outboundorderDetail.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
新建文件夹/WMS/src/extension/inbound/inboundOrder.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
新建文件夹/WMS/src/extension/outbound/outboundOrder.js 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
新建文件夹/WMS/src/views/Index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
н¨Îļþ¼Ð/PDA/pages/stash/CheckoutorderDetail.vue
@@ -120,7 +120,7 @@
                                            // ç”¨æˆ·ç‚¹å‡»ç¡®å®š
                                            setTimeout(() => {
                                                uni.navigateBack({
                                                    delta: 2
                                                    delta: 1
                                                });
                                            }, 500);
                                        } else {
н¨Îļþ¼Ð/PDA/pages/stash/inboundorderDetail.vue
@@ -117,7 +117,7 @@
                                                // ç”¨æˆ·ç‚¹å‡»ç¡®å®š
                                                setTimeout(() => {
                                                    uni.navigateBack({
                                                        delta: 2
                                                        delta:1
                                                    });
                                                }, 500);
                                            } else {
н¨Îļþ¼Ð/PDA/pages/stash/outboundorderDetail.vue
@@ -159,7 +159,7 @@
                                            // ç”¨æˆ·ç‚¹å‡»ç¡®å®š
                                            setTimeout(() => {
                                                uni.navigateBack({
                                                    delta: 2
                                                    delta: 1
                                                });
                                            }, 500);
                                        } else {
н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs
@@ -362,7 +362,6 @@
                        if (materielInfo == null) throw new Exception($"未找到药品编码【{item.goods_no}】的信息");
                        if (!Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
                            throw new Exception($"请设置药品编号【{item.goods_no}】的属性分类");
                        if (materielInfo.BoxQty < 1) throw new Exception($"请设置药品编号【{item.goods_no}】的箱规数量");
                        #endregion
                        #region å¤§ä»¶
                        if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)//如果物料是大件
@@ -382,6 +381,7 @@
                        #endregion
                        else
                        {
                            if (materielInfo.BoxQty < 1) throw new Exception($"请设置药品编号【{item.goods_no}】的箱规数量");
                            if (materielInfo.MinQty < 1) throw new Exception($"请设置药品编号【{item.goods_no}】的立库最低库存数");
                            Dt_CabinOrderDetail orderDetail = null;
                            var ys = item.order_qty % materielInfo.BoxQty; //不能整除箱规的散件数 
н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs
@@ -263,7 +263,7 @@
                                                ERPStockQuantity = 0,
                                                Status = false,
                                                ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
                                                ValidityPeriod = inventoryInfo.ValidityPeriod,
                                                ValidityPeriod = inventoryInfo.ValidityPeriod.ObjToDate(),
                                                Remark = "自动创建"
                                            };
                                            BaseDal.Db.Insertable(inventory_Batch).ExecuteCommand();
н¨Îļþ¼Ð/WMS/src/extension/inbound/inboundOrder.js
@@ -22,10 +22,12 @@
    Bt.onClick = function () {
      let rows = this.$refs.table.getSelected();
      if (rows.length == 0) return this.$error("请选择数据!");
      const allIds = rows.map(item => item.id);
      if(rows.length>1) return this.$error("只能选择一条数据!");
      // const allIds = rows.map(item => item.id);
      const id=rows[0].id
      
      // è¿™é‡Œæ·»åŠ ä½ çš„ä¸šåŠ¡é€»è¾‘
      this.http.post("api/YourApi", allIds).then((x) => {
      this.http.post(`/api/CabinOrder/FinishInOrder?key${id}`).then((x) => {
        if (x.status) {
          this.$Message.success('操作成功');
          this.refresh();
н¨Îļþ¼Ð/WMS/src/extension/outbound/outboundOrder.js
@@ -1,6 +1,7 @@
//此js文件是用来自定义扩展业务代码,可以扩展一些自定义页面或者重新配置生成的代码
import gridBody from './extend/outOrderDetail.vue'
import http from '../../api/http';
let extension = {
    components: {
      //查询界面扩展组件
@@ -23,10 +24,12 @@
    Bt.onClick = function () {
      let rows = this.$refs.table.getSelected();
      if (rows.length == 0) return this.$error("请选择数据!");
      const allIds = rows.map(item => item.id);
      if (rows.length>1)return this.$error("只能选择一条数据")
        const id=rows[0].id;
      //const allIds = rows.map(item => item.id);
      
      // è¿™é‡Œæ·»åŠ ä½ çš„ä¸šåŠ¡é€»è¾‘
      this.http.post("api/YourApi", allIds).then((x) => {
      this.http.post(`/api/DeliveryOrder/FinishOutOrder?key=${id}`).then((x) => {
        if (x.status) {
          this.$Message.success('操作成功');
          this.refresh();
н¨Îļþ¼Ð/WMS/src/views/Index.vue
@@ -321,7 +321,7 @@
      messageList.push(data);
      ElNotification({
        title: data.title,
        message: h("i", { style: "color: teal" }, data.message),
        message: h("i", { style: "color: red" }, data.message),
        position: "bottom-right",
      });
    };