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

zongzhibin

2024-11-22 3c1646a85f085cb0dd8dd386cdcdcd5a221adc4d

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

 CC/iWareCC_ASRS/App - ±¾»ú.config

@@ -16,7 +16,7 @@
  </entityFramework>
  <appSettings>
    <!-- æ˜¯å¦æ¨¡æ‹ŸPLC，发布一定是 FALSE -->
    <add key="IsSimulationPLC" value="true"/>
    <add key="IsSimulationPLC" value="false"/>
    <!-- æ˜¯å¦æ˜¯éšæœºå¯»æ‰¾åº“位，建议是false-->
    <add key="IsRandomFindPlace" value="false"/>
    <!-- è¥¿æ¸¯WMS的API-->

 CC/iWareCC_ASRS/App - Õýʽ.config

@@ -16,7 +16,7 @@
  </entityFramework>
  <appSettings>
    <!-- æ˜¯å¦æ¨¡æ‹ŸPLC，发布一定是 FALSE -->
    <add key="IsSimulationPLC" value="true"/>
    <add key="IsSimulationPLC" value="false"/>
    <!-- æ˜¯å¦æ˜¯éšæœºå¯»æ‰¾åº“位，建议是false-->
    <add key="IsRandomFindPlace" value="false"/>
    <!-- è¥¿æ¸¯WMS的API-->

 CC/iWareCC_ASRS/App.config

@@ -16,7 +16,7 @@
  </entityFramework>
  <appSettings>
    <!-- æ˜¯å¦æ¨¡æ‹ŸPLC，发布一定是 FALSE -->
    <add key="IsSimulationPLC" value="true"/>
    <add key="IsSimulationPLC" value="false"/>
    <!-- æ˜¯å¦æ˜¯éšæœºå¯»æ‰¾åº“位，建议是false-->
    <add key="IsRandomFindPlace" value="false"/>
    <!-- è¥¿æ¸¯WMS的API-->

 CC/iWareCC_ASRS/FormCC.cs

@@ -301,7 +301,7 @@
            }
            else
            {//正式模式 
                rgvServiceClient = new RgvServiceClient();
                stationServiceClient = new StationServiceClient();
            }

            this.lbl_IsSimulationPLC.BackColor = IsSimulationPLC ? Color.Red : Color.Green;

 CC/iWareModel/EnumType/WMS/AreaCodeEnum.cs

@@ -12,6 +12,12 @@
    public enum AreaCodeEnum
    {
        /// <summary>
        /// æ— åŒºåŸŸ 
        /// </summary>
        [Description("无区域")]
        æ— åŒºåŸŸ = 0,

        /// <summary>
        /// å¾…缓存分拣区 
        /// </summary>
        [Description("待缓存分拣区")]

 LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/mes_BatchOrderUPI_New/component/editDialog.vue

@@ -47,8 +47,8 @@
                        
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="部件条码" prop="uPI">
                            <el-input v-model="ruleForm.uPI" placeholder="请输入部件条码" maxlength="50" show-word-limit clearable />
                        <el-form-item label="部件条码" prop="upi">
                            <el-input v-model="ruleForm.upi" placeholder="请输入部件条码" maxlength="50" show-word-limit clearable />
                            
                        </el-form-item>
                        
@@ -233,7 +233,7 @@
        upiStatus: [{required: true, message: '请选择板料状态！', trigger: 'change',},],
        planNo: [{required: true, message: '请输入批次号！', trigger: 'blur',},],
        orderId: [{required: true, message: '请输入订单号！', trigger: 'blur',},],
        uPI: [{required: true, message: '请输入部件条码！', trigger: 'blur',},],
        upi: [{required: true, message: '请输入部件条码！', trigger: 'blur',},],
        detailName: [{required: true, message: '请输入部件名称！', trigger: 'blur',},],
        length: [{required: true, message: '请输入长！', trigger: 'blur',},],
        width: [{required: true, message: '请输入宽！', trigger: 'blur',},],

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

@@ -41,7 +41,7 @@
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUIMes_BatchOrderUPI_New">
            <el-form-item label="部件条码">
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.uPI" clearable="" placeholder="请输入部件条码"/>
              <el-input v-model="queryParamsMes_BatchOrderUPI_New.upi" clearable="" placeholder="请输入部件条码"/>
              
            </el-form-item>
          </el-col>
@@ -199,7 +199,7 @@
          </el-table-column>
        <el-table-column prop="planNo" label="批次号"  show-overflow-tooltip="" />
        <el-table-column prop="orderId" label="订单号"  show-overflow-tooltip="" />
        <el-table-column prop="uPI" label="部件条码"  show-overflow-tooltip="" />
        <el-table-column prop="upi" label="部件条码"  show-overflow-tooltip="" />
        <el-table-column prop="detailName" label="部件名称"  show-overflow-tooltip="" />
        <el-table-column prop="length" label="长"  show-overflow-tooltip="" />
        <el-table-column prop="width" label="宽"  show-overflow-tooltip="" />

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Admin.NET.Application.csproj

@@ -25,6 +25,11 @@
  </ItemGroup>

  <ItemGroup>
    <None Remove="Configuration\Database - æœ¬æœº.json" />
    <None Remove="Configuration\Database - æ­£å¼.json" />
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\Admin.NET.Core\Admin.NET.Core.csproj" />
    <ProjectReference Include="..\Plugins\Admin.NET.Plugin.ApprovalFlow\Admin.NET.Plugin.ApprovalFlow.csproj" />
    <ProjectReference Include="..\Plugins\Admin.NET.Plugin.DingTalk\Admin.NET.Plugin.DingTalk.csproj" />

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Enum/WmsOrder/AreaCodeEnum.cs

@@ -8,6 +8,13 @@
[Description("区域编码枚举")]
public enum AreaCodeEnum
{

    /// <summary>
    /// æ— åŒºåŸŸ 
    /// </summary>
    [Description("无区域")]
    æ— åŒºåŸŸ = 0,

    /// <summary>
    /// å¾…缓存分拣区 
    /// </summary>

 SDA/iWareModel/EnumType/EDevice/EDevice.cs

@@ -17,6 +17,8 @@
        å››å·å †åž›æœº = 4,
        RGV = 5,

        Station = 6,


        å…¥åº“口1015 = 1015,
        å…¥åº“口1019 = 1019,
@@ -46,8 +48,5 @@

        //AGV = 1019,
        AGV = 1099,


        Station = 7777
    }
}

 SDA/iWareSda/App.config

@@ -4,7 +4,8 @@
    <!-- è¯­è¨€é…ç½® é…ç½®  0 ä¸­æ–‡ 1 è‹±æ–‡ -->
    <add key="LanguageFlg" value="0"/>
    <!-- ç«™ç‚¹çš„PLC é…ç½® -->
    <add key="Station_Address" value="172.17.51.202"/>
    <!-- <add key="Station_Address" value="172.17.51.202"/> -->
    <add key="Station_Address" value="192.168.10.100"/>
    <add key="Station_Rack" value="0"/>
    <add key="Station_Slot" value="1"/>
    <add key="Station_Port" value="102"/>

 SDA/iWareSda/Common/SdaHelper.cs

@@ -43,7 +43,14 @@
                    }
                    else
                    {
                        proValues = t1_pro.GetValue(t1, null).ToString();
                        if (t1_pro.GetValue(t1, null) == null)
                        {
                            proValues = "";
                        }
                        else
                        {
                            proValues = t1_pro.GetValue(t1, null).ToString();
                        }
                        arr = proValues.Split(WareSdaStruct.PLCDBADDRESS_SEPARATE);
                        if (arr.Length != 2)
                        {

 SDA/iWareSda/Common/Struct/WareSdaStruct.cs

@@ -97,10 +97,9 @@
        /// ç«™ç‚¹é›†åˆ
        /// </summary>
        public static List<string> StationStationList = new List<string>() {
            "1001","1002","1003","1004","1005","1006","1007","1008","1009","1010",
            "1011","1012","1013","1014","1015",
            "1020","1030","1040",  //拆盘机 æå‡æœº RGV
            "1019"
           StationLocationEnum.首次扫码工位.ToString(),
           StationLocationEnum.BZ01.ToString(),
           StationLocationEnum.BZ39.ToString(),
        };



 SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs

@@ -28,7 +28,7 @@
        /// é½å¥—信息（998齐套，999异常出库）
        /// </summary>
        [Description("齐套信息（998齐套，999异常出库）")]
        public string W_KittingInfo { get; set; }
        public short W_KittingInfo { get; set; }

        /// <summary>
        /// åˆ†é…æ”¾æ–™åº“位号
@@ -175,7 +175,7 @@
        public string W_Inbound_TaskID { get; set; }


    



        /// <summary>

 SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs

@@ -195,13 +195,7 @@
                var stationObj = this.DBBlockForWrite.W_StationForWriteCommList.Where(x => x.StationCode == stationCode).FirstOrDefault();

                var view_stationObj = this.View.W_StationForWriteCommList.Where(x => x.StationCode == stationCode).FirstOrDefault();
                MessageModel b2 = this.plcService.WriteValuePoint(stationObj.W_DataFinish, true, view_stationObj.W_DataFinish);
                if (!b2.result)
                {
                    msg = string.Format("向Station地址{0} å†™  " + true + "失败,返回结果:" + b2.resMsg,
                       stationObj.W_DataFinish);
                    return false;
                }

                int i_result = 0;
                if (value)
                {
@@ -211,13 +205,22 @@
                {
                    i_result = 999;
                }
                b2 = this.plcService.WriteValuePoint(stationObj.W_KittingInfo, i_result, view_stationObj.W_KittingInfo);
                MessageModel b2 = this.plcService.WriteValuePoint(stationObj.W_KittingInfo, i_result, view_stationObj.W_KittingInfo);
                if (!b2.result)
                {
                    msg = string.Format("向Station地址{0} å†™  " + value + "失败,返回结果:" + b2.resMsg,
                      stationObj.W_DataFinish);
                    return false;
                }

                b2 = this.plcService.WriteValuePoint(stationObj.W_DataFinish, true, view_stationObj.W_DataFinish);
                if (!b2.result)
                {
                    msg = string.Format("向Station地址{0} å†™  " + true + "失败,返回结果:" + b2.resMsg,
                       stationObj.W_DataFinish);
                    return false;
                }

                return true;
            }
            catch (Exception ex)

 SDA/iWareSda/PLCService/Default/Siemens_HslCommunicationService.cs

@@ -144,6 +144,10 @@

        public override MessageModel WriteValuePoint(string fullAddress, object value, object proObj)
        {
            if (string.IsNullOrEmpty(fullAddress))
            {
                return new MessageModel() { result = false, resMsg = "地址为空" };
            }
            var arr = fullAddress.Split(WareSdaStruct.PLCDBADDRESS_SEPARATE);
            string dbNumber = arr[0];
            string offset = arr[1];