liuying
2024-11-29 d6bbd8952a4b962e3206e7f62ede763033ec2e1e
扫码
已修改4个文件
172 ■■■■■ 文件已修改
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/index.vue 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeed/index.vue
@@ -42,7 +42,7 @@
                                p-id="11360"
                            ></path>
                        </svg>
                        <p class="okText">获取标签信息成功!</p>
                        <p class="okText">获取部件信息成功!</p>
                    </div>
                    <div class="" v-show="isSuccess && isSuccess != '成功'">
                        <svg t="1732842594517" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4303" width="100" height="100">
@@ -56,14 +56,6 @@
                    </div>
                </div>
                <ul>
                    <!-- <li>
                        <span class="text_left">是否齐包:</span>
                        <span class="text_rt"></span>
                    </li>
                    <li>
                        <span class="text_left">是否齐套:</span>
                        <span class="text_rt"></span>
                    </li> -->
                    <li>
                        <span class="text_left">部件条码:</span>
@@ -84,34 +76,23 @@
                        <span class="text_rt">{{ tableData.orderId }}</span>
                    </li>
                    <li>
                        <span class="text_left">纸箱长:</span>
                        <span class="text_rt">{{ tableData.info1 }}</span>
                        <span class="text_left">长:</span>
                        <span class="text_rt">{{ tableData.length }}</span>
                    </li>
                    <li>
                        <span class="text_left">纸箱宽:</span>
                        <span class="text_rt">{{ tableData.info2 }}</span>
                        <span class="text_left">宽:</span>
                        <span class="text_rt">{{ tableData.width }}</span>
                    </li>
                    <li>
                        <span class="text_left">info3:</span>
                        <span class="text_rt">{{ tableData.info3 }}</span>
                        <span class="text_left">厚:</span>
                        <span class="text_rt">{{ tableData.thk }}</span>
                    </li>
                    <li>
                        <span class="text_left">销售合同单号:</span>
                        <span class="text_rt">{{ tableData.info4 }}</span>
                    </li>
                    <li>
                        <span class="text_left">第几包:</span>
                        <span class="text_rt">{{ tableData.info6 }}</span>
                    </li>
                    <li>
                        <span class="text_left">经销店名称:</span>
                        <span class="text_rt">{{ tableData.info7 }}</span>
                    </li>
                    <li>
                        <span class="text_left">产品名称:</span>
                        <span class="text_rt">{{ tableData.info8 }}</span>
                    </li>
                    <li>
                        <span class="text_left">客户名称:</span>
                        <span class="text_rt">{{ tableData.info10 }}</span>
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue
@@ -11,8 +11,7 @@
                                ref="materialCodeInput"
                                clearable=""
                                placeholder="请扫包装号"
                                @input="handleChange"
                                @keyup.enter.prevent="handleEnter"
                            @keyup.enter.prevent="handleEnter"
                                @confirm.enter.prevent="handleEnter"
                            />
                        </el-form-item>
@@ -257,86 +256,6 @@
    }
}
// 列排序
const sortChange = async (column: any) => {
    queryParams.value.field = column.prop;
    queryParams.value.order = column.order;
    await handleQuery();
};
// 打开新增页面
const openAddWmsSubstituteGood = () => {
    editWmsSubstituteGoodTitle.value = '添加替代品管理';
    editDialogRef.value.openDialog({});
};
// 打开打印页面
const openPrintWmsSubstituteGood = async (row: any) => {
    printWmsSubstituteGoodTitle.value = '打印替代品管理';
};
// 打开编辑页面
const openEditWmsSubstituteGood = (row: any) => {
    editWmsSubstituteGoodTitle.value = '编辑替代品管理';
    editDialogRef.value.openDialog(row);
};
// 删除
const delWmsSubstituteGood = (row: any) => {
    ElMessageBox.confirm(`确定要删除吗?`, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
    })
        .then(async () => {
            var ret = await deleteWmsSubstituteGood(row);
            if (ret.data.type == 'success') {
                handleQuery();
                ElMessage.success('删除成功');
            }
        })
        .catch(() => {});
};
// 改变页面容量
const handleSizeChange = (val: number) => {
    tableParams.value.pageSize = val;
    handleQuery();
};
// 改变页码序号
const handleCurrentChange = (val: number) => {
    tableParams.value.page = val;
    handleQuery();
};
// handleQuery();
const rules = {
    // 这里定义表单验证规则
    completeSet: [{ required: true, message: '请选择齐套', trigger: 'change' }],
    packageSetup: [{ required: true, message: '请输入齐包设置', trigger: 'blur' }],
    ngPackage: [{ required: true, message: '请输入ng包', trigger: 'blur' }],
};
const ruleForm = ref({
    id: '',
    completeSet: '',
    packageSetup: '',
    ngPackage: '',
});
const sourceEnum: any = ref([
    {
        value: 'id',
        text: 'ID',
    },
]);
const handleChange = (event: Event) => {
    console.log('77777777777');
    handleQuery();
};
const handleEnter = (event: Event) => {
    event.preventDefault(); // 阻止默认事件
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs
@@ -233,7 +233,49 @@
    /// </summary>
    public string DetailName { get; set; }
    public float Length { get; set; }
    public float Width { get; set; }
    /// <summary>
    /// 厚
    /// </summary>
    public float Thk { get; set; }
    /// <summary>
    /// 销售合同单号
    /// </summary>
    public string? Info4 { get; set; }
    public string? Info5 { get; set; }
    /// <summary>
    /// 客户名称
    /// </summary>
    public string? Info10 { get; set; }
    /// <summary>
    /// 自提or发货
    /// </summary>
    public string? Info11 { get; set; }
    /// <summary>
    /// 包装部件总数量
    /// </summary>
    public string? Info12 { get; set; }
    /// <summary>
    /// 包装面积
    /// </summary>
    public string? Info13 { get; set; }
    /// <summary>
    /// 部件名称
    /// </summary>
    public string? Info14 { get; set; }
    /// <summary>
    /// 部件数量
    /// </summary>
    public int? Info15 { get; set; }
    public string? Info16 { get; set; }
}
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/WmsStockQuanService.cs
@@ -448,8 +448,18 @@
                    DetailName = item.DetailName,
                    OrderId = item.OrderId,
                    PlanNo = item.PlanNo,
                    Info5= item.Info5,
                    Info5 = item.Info5,
                    Info4 = item.Info4,
                    Info10 = item.Info10,
                    Info11 = item.Info11,
                    Info12= item.Info12,
                    Info13 = item.Info13,
                    Info14 = item.Info14,
                    Info15 = item.Info15,
                    Info16 = item.Info16,
                    Length = item.Length,
                    Width = item.Width,
                    Thk = item.Thk
                });
            }
        }