Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

liuying

2024-11-29 72408cc636fa6b8b670bc0df519eefa837cc2e48

Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

 LA24030_LuLiPackageLine_Print/´òÓ¡Ä£°åÎļþ/°ü×°ÌõÂëÄ£°å_¶þάÂë.btw

Binary files differ

 LA24030_LuLiPackageLine_Web/public/config.js

@@ -4,6 +4,6 @@
  "VITE_OPEN_CDN": "false",
  "VITE_PUBLIC_PATH": "",
  "VITE_SM_PUBLIC_KEY": "0484C7466D950E120E5ECE5DD85D0C90EAA85081A3A2BD7C57AE6DC822EFCCBD66620C67B0103FC8DD280E36C3B282977B722AAEC3C56518EDCEBAFB72C5A05312",
  "VITE_API_URL": "http://localhost:5005"
  //"VITE_API_URL": "http://172.17.1.111:5005"  //正式地址
  //"VITE_API_URL": "http://localhost:5005"
  "VITE_API_URL": "http://172.17.1.111:5005"  //正式地址
} 

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/index.vue

@@ -241,10 +241,11 @@
                @sort-change="sortChangeMes_BatchOrderUPI_New"
                border="">
        <el-table-column type="index" label="序号" width="55" align="center"/>
        <el-table-column prop="upi" label="部件条码"  show-overflow-tooltip="" />
        <el-table-column prop="planNo" label="批次号"  show-overflow-tooltip="" />
        <el-table-column prop="orderId" label="订单号"  show-overflow-tooltip="" />
        <el-table-column prop="info5" label="生产单号"  show-overflow-tooltip="" />
        <el-table-column prop="upi" label="部件条码" width="180" show-overflow-tooltip="" />
        <el-table-column prop="info5" label="生产单号"  width="130" show-overflow-tooltip="" />
        <el-table-column prop="packageCode" label="包装编码"  width="180"  show-overflow-tooltip="" />
        <el-table-column prop="planNo" label="批次号"  width="130"  show-overflow-tooltip="" />
        <el-table-column prop="orderId" label="订单号"  width="130"  show-overflow-tooltip="" />
          <el-table-column prop="areaCode" label="所在区域"  show-overflow-tooltip="" >
            <template #default="scope">
              <el-tag>{{ getEnumDesc(scope.row.areaCode, getEnumAreaCodeData_Index)}}</el-tag>
@@ -260,7 +261,6 @@
        <el-table-column prop="width" label="宽"  show-overflow-tooltip="" />
        <el-table-column prop="thk" label="厚"  show-overflow-tooltip="" />
        <el-table-column prop="isPA" label="是否优化包装"  show-overflow-tooltip="" />
        <el-table-column prop="packageCode" label="包装号"  show-overflow-tooltip="" />
        <el-table-column prop="machineXCenter" label="包装X坐标"  show-overflow-tooltip="" />
        <el-table-column prop="machineYCenter" label="包装Y坐标"  show-overflow-tooltip="" />
        <el-table-column prop="machineZCenter" label="包装Z坐标"  show-overflow-tooltip="" />
@@ -274,11 +274,11 @@
        <el-table-column prop="info7" label="经销店名称"  show-overflow-tooltip="" />
        <el-table-column prop="info8" label="产品名称"  show-overflow-tooltip="" />
        <el-table-column prop="info10" label="客户名称"  show-overflow-tooltip="" />
        <el-table-column prop="info9" label="包装编码"  show-overflow-tooltip="" />
        
        <el-table-column prop="info11" label="自提or发货"  show-overflow-tooltip="" />
        <el-table-column prop="info12" label="包装部件总数量"  show-overflow-tooltip="" />
        <el-table-column prop="info13" label="包装面积"  show-overflow-tooltip="" />
        <el-table-column prop="info14" label="部件名称"  show-overflow-tooltip="" />
        <!-- <el-table-column prop="info14" label="部件名称"  show-overflow-tooltip="" /> -->
        <el-table-column prop="info15" label="部件数量"  show-overflow-tooltip="" />
        <el-table-column prop="info16" label="部件尺寸"  show-overflow-tooltip="" />
        <el-table-column prop="info17" label="机械臂是否旋转"  show-overflow-tooltip="" />

 LA24030_LuLiPackageLine_Web/stats.html

ÎļþÌ«´ó

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json

@@ -9,9 +9,7 @@
        //"ConfigId": "1300000000001", // é»˜è®¤åº“标识-禁止修改
        "DbType": "SqlServer", // MySql、SqlServer、Sqlite、Oracle、PostgreSQL、Dm、Kdbndp、Oscar、MySqlConnector、Access、OpenGauss、QuestDB、HG、ClickHouse、GBase、Odbc、Custom
        // "ConnectionString": "Server=.;Database=iWare_RawMaterialWarehouse_Wms;User=sa;Password=123456;MultipleActiveResultSets=True;", // åº“连接字符串
       // "ConnectionString": "Server=172.17.1.111;Database=LA24030_LuLiPackageLine;User=sa;Password=admin@123;MultipleActiveResultSets=True;", // åº“连接字符串
        "ConnectionString": "Server=.;Database=LA24030_LuLiPackageLine;User=sa;Password=123abc.com;MultipleActiveResultSets=True;", // åº“连接字符串

        "ConnectionString": "Server=172.17.1.111;Database=LA24030_LuLiPackageLine;User=sa;Password=admin@123;MultipleActiveResultSets=True;", // åº“连接字符串
        //"SlaveConnectionConfigs": [ // è¯»å†™åˆ†ç¦»/主从
        //    {
        //        "HitRate": 10,

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs

@@ -45,15 +45,24 @@
            throw Oops.Oh("本次有重复的UPI！重复号为:" + dit.Key + ",重复条数:" + dit.Value);
        }

        //按照批次号+订单号删除
        List<string> packageList = new List<string>();
        input.ForEach(x => packageList.Add(x.PackageCode));//upis是传过来的upi字段集合
        input.ForEach(x => packageList.Add(x.PlanNo + "_" + x.OrderId));//upis是传过来的upi字段集合

        var batchOrderUPIs = await _rep.AsQueryable().Where(x => packageList.Contains(x.PackageCode)).ToListAsync();//batchOrderUPIs是重复的upi集合
        var batchOrderUPIs = await _rep.AsQueryable().Where(x => packageList.Contains(x.PlanNo + "_" + x.OrderId)).ToListAsync();//batchOrderUPIs是重复的upi集合
        //批量删除
        await _rep.DeleteAsync(batchOrderUPIs);

        //批量删除
        await _mes_Package_Gather_Rep.DeleteAsync(x => packageList.Contains(x.PackageCode));
        await _mes_Package_Gather_Rep.DeleteAsync(x => packageList.Contains(x.PlanNo + "_" + x.OrderId));

        //删除重复的upi数据
        List<string> upis = new List<string>();
        input.ForEach(x => upis.Add(x.UPI));//upis是传过来的upi字段集合
        var queryDateTime = DateTime.Now.AddDays(-7);
        var batchOrderUPIs22 = await _rep.AsQueryable().Where(x => upis.Contains(x.UPI) && x.CreateTime >= queryDateTime).ToListAsync();//batchOrderUPIs是重复的upi集合
        //批量删除
        await _rep.DeleteAsync(batchOrderUPIs22);

        foreach (var item in input)
        {