ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_Tasks/³ÉÆ·²Ö/AGV_CPExtend.cs

@@ -103,7 +103,7 @@
                                throw new Exception("未找到AGV站点");
                            }
                            //取放任务模版
                            if ((stationMangerStart.StationCode.Contains("PNT") || stationMangerStart.StationCode.Contains("-")) && !stationMangerEnd.StationCode.Contains("PNT") && stationMangerEnd.IsManual==0)//请求放
                            if ((stationMangerStart.StationCode.Contains("PNT") || stationMangerStart.IsManual == 1) && !stationMangerEnd.StationCode.Contains("PNT") && stationMangerEnd.IsManual == 0)//请求放
                            {
                                agvTaskSend.TaskCode = "DUIGAO1";
                                if (stationMangerStart.StationType == 998 || stationMangerEnd.StationType == 998)//潜伏顶升车
@@ -111,7 +111,7 @@
                                    agvTaskSend.TaskCode = "DUOLUN1";
                                }
                            }
                            else if (!stationMangerStart.StationCode.Contains("PNT") && stationMangerEnd.StationCode.Contains("PNT") && stationMangerStart.IsManual == 0)//请求取
                            else if (!stationMangerStart.StationCode.Contains("PNT") &&(stationMangerEnd.StationCode.Contains("PNT") || stationMangerEnd.IsManual == 1) && stationMangerStart.IsManual == 0)//请求取
                            {
                                agvTaskSend.TaskCode = "DUIGAO2";
                                if (stationMangerStart.StationType==998 || stationMangerEnd.StationType == 998)//潜伏顶升车

 ÏîÄ¿´úÂë/WMS/WMSClient/src/extension/outbound/extend/SelectedStock.vue

@@ -208,11 +208,12 @@
              { label: '出库中', value: 1 },
              { label: '出库完成', value: 2 },
              { label: '拣选完成', value: 3 },
              { label: '撤销', value: 99 }
              { label: '撤销', value: 99 },
              { label: '关闭', value: 100 }
          ]
          this.tableData=x.map((i) => ({
            ...i,
            status:label.find((j) => j.value === i.status).label
            status:label.find((j) => j.value === i.status)?.label || i.status
          }))
        });
    },

 ÏîÄ¿´úÂë/WMS/WMSClient/src/router/viewGird.js

@@ -275,6 +275,14 @@
    path: '/returnBSTOrderDetail',
    name: 'returnBSTOrderDetail',
    component: () => import('@/views/inbound/returnBSTOrderDetail.vue')
  },{
    path: '/outMESOrder',
    name: 'outMESOrder',
    component: () => import('@/views/outbound/outMESOrder.vue')
  },{
    path: '/outSGOrderDetail',
    name: 'outSGOrderDetail',
    component: () => import('@/views/outbound/outSGOrderDetail.vue')
  }
]
export default viewgird

 ÏîÄ¿´úÂë/WMS/WMSClient/src/views/Home.vue

@@ -698,8 +698,8 @@

.location-view {
  flex: 1;
  width: 360%;
  max-width: 360%;
  width: 470%;
  max-width: 470%;
  overflow: auto;
  padding: 20px;
  background-color: #f5f7fa;

 ÏîÄ¿´úÂë/WMS/WMSClient/src/views/inbound/mesPPBackInboundOrderDetail.vue

@@ -21,7 +21,7 @@
    const table = ref({
      key: "id",
      footer: "Foots",
      cnName: "入库单",
      cnName: "入库单明细",
      name: "inboundOrder",
      url: "/InboundOrder/",
      sortName: "id",

 ÏîÄ¿´úÂë/WMS/WMSClient/src/views/outbound/outMESOrder.vue

@@ -0,0 +1,302 @@
<template>
  <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
    :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
    :table="table" :extend="extend">
  </view-grid>
</template>
<script>
import extend from "@/extension/inbound/mesProInOrderInfo.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
  setup() {
    const table = ref({
      key: "id",
      footer: "Foots",
      cnName: "MES领料计划单",
      name: "outMESOrder",
      url: "/OutMESOrder/",
      sortName: "id",
    });
    const editFormFields = ref({

    });
    const editFormOptions = ref([

    ]);
    const searchFormFields = ref({
      warehouseId:"",
      productOrderNo:"",
      mESProOrderType:"",
      mESProOrderStatus:"",
      materialCode:"",
      materialLot:"",
      proPackCode:"",
      createDate:"",
    });
    const searchFormOptions = ref([
      [
        { title: "仓库", field: "warehouseId", type: "select", dataKey: "warehouses", data: [], },
        { title: "出库来源明细ID", field: "outDetailId", type: "like" },
        { title: "生产订单编码", field: "productOrderNo", type: "like" },
        { title: "WMS单据编号", field: "outMESOrderNo", type: "like" },
      ],
      [
        { title: "派单工单编码", field: "sendOrderNo", type: "like" },
        { title: "物料编码", field: "materialCode", type: "like" },
        { title: "加工中心区域", field: "makeArea", type: "like" },
        { title: "加工中心编号（机台）", field: "makeCode", type: "select", dataKey: "makeCodeEnum", data: [] }
      ],
      [
        { title: "生产订单状态", field: "outMESOrderStatus", type: "select", dataKey: "outboundStatusEnum", data: [] },
        { title: "计划领料时间", field: "planPickTime", type: "date" },
        { title: "结束时间", field: "endTime", type: "date" },
      ]
    ]);
    const columns = ref([
      {
        field: "id",
        title: "Id",
        type: "int",
        width: 90,
        hidden: true,
        readonly: true,
        require: true,
        align: "left",
      },
      {
        field: "warehouseId",
        title: "仓库",
        type: "string",
        width: 90,
        align: "left",
        bind: { key: "warehouses", data: [] }
      },
      {
        field: "outDetailId",
        title: "出库来源明细ID",
        type: "int",
        width: 150,
        align: "left",
      },
      {
        field: "outMESOrderNo",
        title: "WMS单据编号",
        type: "string",
        width: 200,
        align: "left",
      },
      {
        field: "productOrderNo",
        title: "生产订单编号（上游）",
        type: "string",
        width: 200,
        align: "left",
      },
      {
        field: "sendOrderNo",
        title: "派单工单编码",
        type: "string",
        width: 150,
        align: "left",
      },
       {
        field: "materialCode",
        title: "物料编号",
        type: "string",
        width: 150,
        align: "left",
      },
      {
        field: "materialLot",
        title: "物料批次",
        type: "string",
        width: 150,
        align: "left",
      },
      {
        field: "gradeCode",
        title: "物料等级",
        type: "string",
        width: 150,
        align: "left",
      },
      {
        field: "reqQuantity",
        title: "物料需求数量",
        type: "decimal",
        width: 120,
        align: "left",
      },
      {
        field: "makeArea",
        title: "加工中心区域",
        type: "string",
        width: 150,
        align: "left",
      },
      {
        field: "makeCode",
        title: "加工中心编号（机台）",
        type: "string",
        width: 200,
        align: "left",
        bind: { key: "", data: [
        {key: "11",value: "一号印刷机（意高发）" },
        {key: "12",value: "二号印刷机（华阳中间）" },
        {key: "13",value: "三号印刷机（华阳北边）" },
        {key: "31",value: "一号织布机" },
        {key: "33",value: "二号织布机" },
        {key: "22",value: "一号中速分切机" },
        {key: "21",value: "二号高速分切机" },
        {key: "25",value: "一号冲切机" },
        {key: "26",value: "二号冲切机" },
        {key: "27",value: "三号冲切机" },
        {key: "26",value: "一号清废码垛模切机" },
        {key: "27",value: "二号清废码垛模切机" },
        {key: "41",value: "一号纸张双面淋膜机" },
        {key: "42",value: "一号无纺布双面淋膜机" },    
        {key: "64",value: "一号纸袋四杯机" },
        {key: "65",value: "二号纸袋四杯机" },
        {key: "66",value: "三号扁绳内折双杯机" },
        {key: "67",value: "五号纸袋双杯机" },
        {key: "68",value: "六号纸袋双杯机" },
        {key: "69",value: "七号纸袋双杯机" },
        {key: "6A",value: "八号纸袋双杯机" },
        {key: "6B",value: "九号纸袋单杯机" },
        {key: "6C",value: "十号纸袋单杯机" },
        {key: "6D",value: "十一号纸袋单杯机" },
        {key: "51",value: "一号无纺布制袋机" },
        {key: "52",value: "二号无纺布制袋机" },
        {key: "53",value: "三号无纺布制袋机" },
        {key: "54",value: "五号无纺布制袋机" },
        {key: "55",value: "六号无纺布制袋机" },
        {key: "56",value: "七号无纺布制袋机" },
        {key: "57",value: "八号无纺布制袋机" },
        {key: "58",value: "九号无纺布制袋机" },
        {key: "59",value: "十号无纺布制袋机" },
        {key: "5A",value: "十一号无纺布制袋机" },
        {key: "81",value: "一号立式纸杯机" },
        {key: "82",value: "二号立式纸杯机" },
        {key: "83",value: "三号立式纸杯机" },
        {key: "84",value: "五号立式纸杯机" },
        {key: "85",value: "六号立式纸杯机" },
        {key: "86",value: "七号立式纸杯机" },
        {key: "87",value: "八号立式纸杯机" },
        {key: "88",value: "九号立式纸杯机" },
        {key: "89",value: "十号立式纸杯机" },
        {key: "8A",value: "十一号立式纸杯机" },
        {key: "8B",value: "十二号立式纸杯机" },
        {key: "8C",value: "一号卧式纸杯机" },
        {key: "8D",value: "一号外套纸杯机" },
        {key: "8E",value: "二号外套纸杯机" },
        {key: "8F",value: "三号外套纸杯机" },
        {key: "8G",value: "五号外套纸杯机" },
        {key: "8H",value: "二号卧式纸杯机" },
        {key: "8I",value: "三号卧式纸杯机" },
        {key: "8J",value: "六号外套纸杯机" },
        {key: "8K",value: "七号外套纸杯机" },
        {key: "8L",value: "八号外套纸杯机" },
        {key: "8M",value: "九号外套纸杯机" },
        {key: "8N",value: "五号卧式纸杯机" },
        {key: "8O",value: "六号卧式纸杯机" },
        {key: "8P",value: "七号卧式纸杯机" },
        {key: "8Q",value: "十三号立式纸杯机" },
        {key: "8R",value: "十五号立式纸杯机" },
        {key: "8S",value: "十六号立式纸杯机" },
        {key: "8T",value: "十七号立式纸杯机" },
        {key: "8U",value: "十八号立式纸杯机" },
        ] },
      },
      {
        field: "outMESOrderStatus",
        title: "生产订单状态",
        type: "int",
        width: 150,
        align: "left",
        bind: { key: "outboundStatusEnum", data: [] },
      },
      {
        field: "planDate",
        title: "计划领料时间",
        type: "datetime",
        width: 160,
        align: "left",
      },
      {
        field: "endDate",
        title: "结束领料时间",
        type: "datetime",
        width: 160,
        align: "left",
      },
         {
          field: "assignTotalUsage",
          title: "已分配需求数量",
          type: "decimal",
          width: 150,
          align: "left",
        },
        {
          field: "outTotalUsage",
          title: "已出需求数量",
          type: "decimal",
          width: 150,
          align: "left",
        },
        {
          field: "remark",
          title: "备注",
          type: "string",
          width: 150,
          align: "left",
        },

      {
        field: "creater",
        title: "创建人",
        type: "string",
        width: 90,
        align: "left",
      },
      {
        field: "createDate",
        title: "创建时间",
        type: "datetime",
        width: 160,
        align: "left",
      },
      {
        field: "modifier",
        title: "修改人",
        type: "string",
        width: 100,
        align: "left",
      },
      {
        field: "modifyDate",
        title: "修改时间",
        type: "datetime",
        width: 160,
        align: "left",
      },
    ]);
    const detail = ref({
      cnName: "",
      table: "",
      columns: [],
      sortName: "",
      key: "",
    });
    return {
      table,
      extend,
      editFormFields,
      editFormOptions,
      searchFormFields,
      searchFormOptions,
      columns,
      detail,
    };
  },
});
</script>

 ÏîÄ¿´úÂë/WMS/WMSClient/src/views/outbound/outSGOrder.vue

@@ -42,7 +42,7 @@
      [
        { title: "WMS单号", field: "outSGOrderNo", type: "like" },
        { title: "出库上游ID", field: "boardMpsId", type: "like" },
        { title: "上游生产单号", field: "orderId", type: "like" },
        { title: "排程号", field: "orderId", type: "like" },
        {
          title: "单据状态",
          field: "outSGOrderStatus",

 ÏîÄ¿´úÂë/WMS/WMSClient/src/views/outbound/outSGOrderDetail.vue

@@ -18,79 +18,26 @@
      sortName: "id",
    });
    const editFormFields = ref({
      deviceCode: "",
      deviceName: "",
      deviceType: "",
      deviceStatus: "",
      deviceIp: "",
      devicePort: "",
      devicePlcType: "",
      deviceRemark: "",
    });
    const editFormOptions = ref([
      [
        {
          title: "设备编号",
          required: true,
          field: "deviceCode",
          type: "string",
        },
        {
          title: "设备名称",
          required: true,
          field: "deviceName",
          type: "string",
        },
        {
          title: "设备类型",
          required: true,
          field: "deviceType",
          type: "string",
        },
        {
          title: "设备状态",
          required: true,
          field: "deviceStatus",
          type: "string",
        },
      ],
      [
        { title: "设备IP", required: true, field: "deviceIp", type: "string" },
        {
          title: "设备端口",
          required: true,
          field: "devicePort",
          type: "string",
        },
        {
          title: "PLC类型",
          required: true,
          field: "devicePlcType",
          type: "string",
        },
        {
          title: "备注",
          field: "deviceRemark",
          type: "string",
        },
      ],
    ]);
    const searchFormFields = ref({
      deviceCode: "",
      deviceType: "",
      deviceStatus: "",
    });
    const searchFormOptions = ref([
      [
        { title: "设备编号", field: "deviceCode" },
        { title: "设备类型", field: "deviceType" },
        { title: "设备状态", field: "deviceStatus" },
        { title: "出库单主键", field: "outSGOrderId" },
        { title: "物料编号", field: "materialNo" },
        { title: "楞别", field: "boardFluteNo" },
        { title: "机台位", field: "machineName" },
      ],
      [
        { title: "订单明细状态", field: "outSGOrderDetailStatus" },
      ],
    ]);
    const columns = ref([
      {
        field: "id",
        title: "Id",
        title: "ID",
        type: "int",
        width: 90,
        hidden: true,
@@ -100,72 +47,134 @@
      {
        field: "outSGOrderId",
        title: "出库单主键",
        type: "string",
        width: 90,
        type: "int",
        width: 120,
        align: "left",
        hidden: true,
      },
      {
        field: "MaterialNo",
        field: "boardMpsId",
        title: "上游单据ID",
        type: "int",
        width: 120,
        align: "left",
      },
      {
        field: "boardMpsDetailId",
        title: "上游明细ID",
        type: "int",
        width: 120,
        align: "left",
      },
      {
        field: "width",
        title: "幅宽",
        type: "decimal",
        width: 100,
        align: "left",
      },
      {
        field: "xqLen",
        title: "需求长度",
        type: "decimal",
        width: 120,
        align: "left",
      },
      {
        field: "totalUsage",
        title: "总用量",
        type: "decimal",
        width: 120,
        align: "left",
      },
      {
        field: "materialId",
        title: "物料ID",
        type: "int",
        width: 100,
        align: "left",
      },
      {
        field: "materialNo",
        title: "物料编号",
        type: "string",
        width: 150,
        align: "left",
      },
      {
        field: "materielName",
        field: "materialName",
        title: "物料名称",
        type: "string",
        width: 150,
        align: "left",
      },
      {
        field: "batchNo",
        title: "批次号",
        field: "procurementLength",
        title: "采购长度",
        type: "decimal",
        width: 90,
        align: "left",
      },
      {
        field: "orderQuantity",
        title: "单据数量",
        type: "string",
        width: 90,
        align: "left",
      },
      {
        field: "lockQuantity",
        title: "锁定数量",
        type: "int",
        width: 120,
        align: "left",
      },
      {
        field: "overOutQuantity",
        title: "已出数量",
        field: "boardFluteNo",
        title: "楞别",
        type: "string",
        width: 200,
        width: 100,
        align: "left",
      },
      {
        field: "orderDetailStatus",
        title: "订单明细状态",
        field: "machineName",
        title: "机台位",
        type: "string",
        width: 180,
        width: 100,
        align: "left",
      },
      {
        field: "totalLenth",
        title: "总长度",
        type: "decimal",
        width: 120,
        align: "left",
      },
      {
        field: "assignTotalUsage",
        title: "已分配用量",
        type: "decimal",
        width: 120,
        align: "left",
      },
      {
        field: "outTotalUsage",
        title: "已出用量",
        type: "decimal",
        width: 120,
        align: "left",
      },
      {
        field: "outSGOrderDetailStatus",
        title: "订单明细状态",
        type: "int",
        width: 150,
        align: "left",
      },
      {
        field: "number",
        title: "序号",
        type: "int",
        width: 80,
        align: "left",
      },
      {
        field: "creater",
        title: "创建人",
        type: "string",
        width: 90,
        width: 100,
        align: "left",
      },
      {
        field: "createDate",
        title: "创建时间",
        type: "datetime",
        width: 160,
        width: 180,
        align: "left",
      },
      {
@@ -179,22 +188,23 @@
        field: "modifyDate",
        title: "修改时间",
        type: "datetime",
        width: 160,
        width: 180,
        align: "left",
      },
      {
        field: "remark",
        title: "备注",
        type: "string",
        width: 100,
        width: 150,
        align: "left",
      },
    ]);
    const detail = ref({
      cnName: "#detailCnName",
      table: "",
      cnName: "出库明细单",
      table: "OutSGOrderDetail",
      columns: [],
      sortName: "",
      sortName: "id",
      key: "id",
    });
    return {
      table,

 ÏîÄ¿´úÂë/WMS/WMSClient/src/views/outbound/outStockLockInfo.vue

@@ -111,7 +111,7 @@
        {title: "货位编号",field: "locationCode",type: "like",},
        { title: "托盘编号", field: "palletCode", type: "like" },
        { title: "任务号", field: "taskNum", type: "like" },
        { title: "状态", field: "status", type: "select",dataKey:"outboundStatusEnum", data:[]},
        { title: "状态", field: "status", type: "select",dataKey:"outLockStockStatusEnum", data:[]},
      ],
      [
        { title: "创建时间", field: "createDate", type: "datetime" },
@@ -264,7 +264,7 @@
        type: "select",
        width: 100,
        align: "left",
        bind: { key: "outboundStatusEnum", data: [] },
        bind: { key: "outLockStockStatusEnum", data: [] },
      },
      {
        field: "creater",

 ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_SystemService/Sys_DictionaryService.cs

@@ -761,6 +761,58 @@
                            result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
                        }
                        break;
                    case "outOrderTypeEnum":
                        {
                            List<object> data = new List<object>();
                            {
                                Type type = typeof(OutOrderTypeEnum);
                                List<int> enums = Enum.GetValues(typeof(OutOrderTypeEnum)).Cast<int>().ToList();
                                int index = 0;
                                foreach (var item in enums)
                                {
                                    FieldInfo? fieldInfo = typeof(OutOrderTypeEnum).GetField(((OutOrderTypeEnum)item).ToString());
                                    DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
                                    if (description != null)
                                    {
                                        data.Add(new { key = item.ToString(), value = description.Description });
                                    }
                                    else
                                    {
                                        data.Add(new { key = item.ToString(), value = item.ToString() });
                                    }
                                    index++;
                                }
                            }

                            result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
                        }
                        break;
                    case "outLockStockStatusEnum":
                        {
                            List<object> data = new List<object>();
                            {
                                Type type = typeof(OutLockStockStatusEnum);
                                List<int> enums = Enum.GetValues(typeof(OutLockStockStatusEnum)).Cast<int>().ToList();
                                int index = 0;
                                foreach (var item in enums)
                                {
                                    FieldInfo? fieldInfo = typeof(OutLockStockStatusEnum).GetField(((OutLockStockStatusEnum)item).ToString());
                                    DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
                                    if (description != null)
                                    {
                                        data.Add(new { key = item.ToString(), value = description.Description });
                                    }
                                    else
                                    {
                                        data.Add(new { key = item.ToString(), value = item.ToString() });
                                    }
                                    index++;
                                }
                            }

                            result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
                        }
                        break;
                }
                return result;
            }

 ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_WMSServer/appsettings.json

@@ -6,7 +6,7 @@
      "Microsoft.AspNetCore": "Warning"
    }
  },
  "dics": "materielInvOrgEnum,agvStationAreaEnum,inboundState,createType,enableEnum,enableStatusEnum,locationStatusEnum,locationTypeEnum,taskStatusEnum,outboundStatusEnum,stockStatusEmun,stockChangeType,outStockStatus,authorityScope,authorityScopes,locationChangeType,warehouses,taskType,printStatus,outLockStockStatusEnum,proStockAttributeEnum,materielSourceTypeEnum,materielTypeEnum,materielUnitEnum,printAreaEnum,inOrderTypeEnum",
  "dics": "materielInvOrgEnum,agvStationAreaEnum,inboundState,createType,enableEnum,enableStatusEnum,locationStatusEnum,locationTypeEnum,taskStatusEnum,outboundStatusEnum,stockStatusEmun,stockChangeType,outStockStatus,authorityScope,authorityScopes,locationChangeType,warehouses,taskType,printStatus,outLockStockStatusEnum,proStockAttributeEnum,materielSourceTypeEnum,materielTypeEnum,materielUnitEnum,printAreaEnum,inOrderTypeEnum,outOrderTypeEnum",
  "AllowedHosts": "*",
  "ConnectionStringsEncryption": false,
  "MainDB": "DB_WIDESEA", //当前项目的主库，所对应的连接字符串的Enabled必须为true