Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu

肖洋

2025-02-11 94da496a424726778aca11a0efc3358202dc8b17

Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu

 Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js

@@ -25,15 +25,15 @@
          this.$refs.gridBody.open();
        };
      }
      this.buttons.unshift({
        //也可以用push或者splice方法来修改buttons数组
        name: "开启服务", //按钮名称
        icon: "el-icon-document", //按钮图标vue2版本见iview文档icon，vue3版本见element ui文档icon(注意不是element puls文档)
        type: "primary", //按钮样式vue2版本见iview文档button，vue3版本见element ui文档button
        onClick: function () {
          this.$Message.success("开启服务");
        },
      });
      // this.buttons.unshift({
      //   //也可以用push或者splice方法来修改buttons数组
      //   name: "开启服务", //按钮名称
      //   icon: "el-icon-document", //按钮图标vue2版本见iview文档icon，vue3版本见element ui文档icon(注意不是element puls文档)
      //   type: "primary", //按钮样式vue2版本见iview文档button，vue3版本见element ui文档button
      //   onClick: function () {
      //     this.$Message.success("开启服务");
      //   },
      // });
    },
    onInited() {
      //框架初始化配置后

 Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue

@@ -92,7 +92,7 @@
        field: "palletCode",
        title: "托盘编号",
        type: "string",
        width: 200,
        width: 160,
        align: "left",
      },
      {
@@ -136,14 +136,14 @@
        field: "currentAddress",
        title: "当前位置",
        type: "string",
        width: 120,
        width: 110,
        align: "left",
      },
      {
        field: "nextAddress",
        title: "下一位置",
        type: "string",
        width: 120,
        width: 110,
        align: "left",
      },
      {
@@ -165,7 +165,7 @@
        field: "dispatchertime",
        title: "任务下发时间",
        type: "datetime",
        width: 150,
        width: 110,
        align: "left",
      },
      {
@@ -194,7 +194,7 @@
        field: "modifier",
        title: "修改人",
        type: "string",
        width: 100,
        width: 90,
        align: "left",
      },
      {

 Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js

@@ -214,7 +214,7 @@
  {
    path: '/DtBoxing',
    name: 'DtBoxing',
    component: () => import('@/views/widesea_wms/stock/DtBoxing.vue'),
    component: () => import('@/views/widesea_wms/stock/DtBoxingInfo.vue'),
    meta: {
      keepAlive: false
    }

 Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxing.vue

@@ -28,6 +28,7 @@
                { field: 'createDate', title: '创建时间', type: 'int', sort: true, width: 100, hidden: true, align: 'left' },
            ],
            detailColumns: [
                { title: "电芯序列号", field: "serialNumber", type: "text" },
                { title: "物料编号", field: "materielCode", type: "text" },
                { title: "物料名称", field: "materielName", type: "text" },
                { title: "库存状态", field: "status", type: "text" },
@@ -60,17 +61,31 @@
            }
        };
    },

    methods: {
        onInit() {
            // this.dropdownItems.unshift({
            //     name: '按钮', //按钮名称
            //     icon: 'el-icon-document', //按钮图标vue2版本见iview文档icon，vue3版本见element ui文档icon(注意不是element puls文档)
            //     type: 'primary', //按钮样式vue2版本见iview文档button，vue3版本见element ui文档button
            //     value: '321', //按钮值
            //     onClick: function () {
            //         this.$Message.success('点击了按钮');
            //     }
            // });
            this.dropdownItems.unshift({
                name: '删除', //按钮名称
                icon: 'el-icon-document', //按钮图标vue2版本见iview文档icon，vue3版本见element ui文档icon(注意不是element puls文档)
                type: 'primary', //按钮样式vue2版本见iview文档button，vue3版本见element ui文档button
                value: '321', //按钮值
                onClick: function () {
                    let rows = this.table.columns;
                    if (rows.length == 0) return this.$error("请选择数据!");
                    if (rows.length > 1) return this.$error("只能选择一条数据!");
                    this.http
                        .post("api/DtBoxing/Delete?locationID=" + rows[0].palletCode, "", "数据处理中...")
                        .then((x) => {
                            if (x.status) {
                                this.$Message.success('成功.');
                                this.refresh();
                            } else {
                                return this.$error(x.message);
                            }
                        });
                }
            });

        },
    },
    created() {

 Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,77 @@
<!--
*Author：jxx
 *Contact：283591387@qq.com
 *代码由框架生成,任何更改都可能导致被代码生成器覆盖
 *业务请在@/extension/widesea_wms/invoices/Dt_InboundOrder.js此处编写
 -->
<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/widesea_wms/stock/DtBoxingInfo.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
    setup() {
        const table = ref({
            key: 'id',
            footer: "Foots",
            cnName: '组盘信息',
            name: 'stock/DtBoxingInfo',
            url: "/BoxingInfo/",
            sortName: "id"
        });
        const editFormFields = ref({

        });
        const editFormOptions = ref([

        ]);
        const searchFormFields = ref({});
        const searchFormOptions = ref([
            [
                { "title": "托盘条码", "field": "palletCode", type: "text" },
                { "title": "物料编号", "field": "materielCode", type: "text" },
                { "title": "库存状态", "field": "status", type: "select", dataKey: "StockState", data: [] },
                { "title": "组盘类型", "field": "groupType", type: "select", dataKey: "GroupType", data: [] },
            ]
        ]);
        const columns = ref([
            { field: 'id', title: '库存ID', type: 'int', width: 110, readonly: true, hidden: true, require: true, align: 'left' },
            { field: 'palletCode', title: '托盘条码', type: 'string', width: 110, align: 'left', sort: true, link: true, },
            { field: 'locationCode', title: '库位', type: 'string', width: 110, align: 'left' },
            { field: 'isFull', title: '是否满盘', type: 'bool', width: 110, align: 'left' },
            // { field: 'state', title: '库存状态', type: 'int', width: 110, align: 'left', bind: { key: "StockState", data: [] } },
            { field: 'remark', title: '备注', type: 'string', width: 120, align: 'left' },
            { field: 'createDate', title: '创建时间', type: 'int', sort: true, width: 100, align: 'left' },
        ]);

        const detail = ref({
            cnName: "组盘明细信息",
            table: "DtBoxingInfoDetail",
            columns: [
                { title: "电芯序列号", field: "serialNumber", type: "text" },
                { title: "物料编号", field: "materielCode", type: "text" },
                { title: "物料名称", field: "materielName", type: "text" },
                { title: "库存状态", field: "status", type: "text" },
                { title: "组盘数量", field: "stockQuantity", type: "text" },
                { title: "创建时间", field: "createDate", type: "text" },
            ],
            sortName: "id",
            key: "BoxingInfoId"
        });
        return {
            table,
            extend,
            editFormFields,
            editFormOptions,
            searchFormFields,
            searchFormOptions,
            columns,
            detail,
        };
    },
});
</script>

 Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_BillGroupStock.vue

@@ -47,6 +47,7 @@
                { "title": "库存类型", "field": "isFull", type: "select", dataKey: "isFull", data: [] },
            ],[
                { "title": "库位号", "field": "locationCode", type: "text" },
                // { "title": "巷道", "field": "roadwayNo", type: "text" },
            ]
        ]);
        const columns = ref(

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs

@@ -29,9 +29,16 @@

                var result = JsonConvert.DeserializeObject<RequsetCellInfo>(json.ToString());

                var area = _areaInfoRepository.QueryFirst(x => x.AreaID == result.LocationArea);
                //var area = _areaInfoRepository.QueryFirst(x => x.AreaID == result.LocationArea);

                var info = _stockInfoRepository.QueryFirst(x => x.LocationCode == result.LocationID && x.AreaCode == area.AreaCode);
                var location = _locationRepository.QueryFirst(x => x.LocationCode == result.LocationID && x.AreaId == result.LocationArea);

                if (location != null)
                {
                    throw new Exception("请求异常：未知库位");
                }

                var info = _stockInfoRepository.QueryFirst(x => x.LocationCode == result.LocationID && x.LocationId == location.Id);

                //todo
                if (info != null)

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs

@@ -182,7 +182,7 @@
    {
        string[] chineseNumbers = new string[] { "零", "一", "二", "三", "四", "五", "六", "七", "八", "九" };
        var locationList = new List<DtLocationInfo>();
        for (int line = 7; line <= x; line++)
        for (int line = 3; line <= x; line++)
        {
            for (int column = 1; column <= y; column++)
            {
@@ -198,7 +198,7 @@
                        LocationType = locType,
                        Remark = "",
                        Depth = locType > 1 ? (((line - 1) % 4) + 1) == 2 || (((line - 1) % 4) + 1) == 3 ? 1 : 2 : 1,
                        RoadwayNo = locType > 1 ? $"JZSC{((line - 1) / 4) + 1}" : $"JZSC{((line - 1) / 2) + 1}",
                        RoadwayNo = locType > 1 ? $"GWSC{((line - 1) / 4) + 1}" : $"GWSC{((line - 1) / 2) + 1}",
                        LocationStatus = LocationEnum.Free.ObjToInt(),
                        AreaId = areaId,
                        Creater = "systeam",