maqiao
/
HuNan_DM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: maqiao:adf92e852d4d692722177f40535b99f148987bfb
Branches Tags
maqiao:master
maqiao:SanYa_ZhuYuan
maqiao:SanYa
maqiao:secondMaster
..
compare: maqiao:3bb1ef457aafa14c47dcd4136feeb917f1becafd
Branches Tags
maqiao:SanYa_ZhuYuan
maqiao:SanYa
maqiao:secondMaster
maqiao:master

No commits in common. "adf92e852d4d692722177f40535b99f148987bfb" and "3bb1ef457aafa14c47dcd4136feeb917f1becafd" have entirely different histories.
adf92e852d ... 3bb1ef457a

2 changed files with 3 additions and 15 deletions
Show Stats Expand all files Collapse all files

8
DM_Weight/App.config
View File

@ -40,11 +40,11 @@
<!-- 抽屉串口使用的协议232或者485 --> <!-- 抽屉串口使用的协议232或者485 -->
<add key="DrawerProtocol" value="485" /> <add key="DrawerProtocol" value="485" />
<!-- 抽屉串口的串口号 --> <!-- 抽屉串口的串口号 -->
<add key="DrawerPortPath" value="COM18" /> <add key="DrawerPortPath" value="COM3" />
<!-- can总线串口的串口号 --> <!-- can总线串口的串口号 -->
<add key="CanBusPortPath" value="COM17" /> <add key="CanBusPortPath" value="COM9" />
<!-- 条码枪串口的串口号 --> <!-- 条码枪串口的串口号 -->
<add key="ScanCodePortPath" value="COM111" /> <add key="ScanCodePortPath" value="COM11" />
<!-- 抽屉串口的串口号 --><!-- <!-- 抽屉串口的串口号 --><!--
<add key="DrawerPortPath" value="COM11" /> <add key="DrawerPortPath" value="COM11" />
--><!-- can总线串口的串口号 --><!-- --><!-- can总线串口的串口号 --><!--
@ -61,8 +61,6 @@
<add key="fingerIp" value="192.168.50.201"/> <add key="fingerIp" value="192.168.50.201"/>
<!--一个抽屉对应标签数--> <!--一个抽屉对应标签数-->
<add key="labelCount" value="2"/> <add key="labelCount" value="2"/>
<!--库存盘点17号库位线程等待时间（毫秒）-->
<add key="CheckSleepMilliseconds" value="500"/>
</appSettings> </appSettings>
</configuration> </configuration>

10
DM_Weight/ViewModels/BindingChannelNewDialogViewModel.cs
View File

@ -546,20 +546,10 @@ namespace DM_Weight.ViewModels
_portUtil.WriteQuantity(item.DrawerNo, item.ColNo, item.totalCount); _portUtil.WriteQuantity(item.DrawerNo, item.ColNo, item.totalCount);
//await Task.Delay(200); //await Task.Delay(200);
} }
SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#00e676"));
SnackbarMessageQueue.Enqueue("标签渲染完成！");
return;
} }
}); });
//GetChannelsByDrawerNo(); //GetChannelsByDrawerNo();
} }
else
{
SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
SnackbarMessageQueue.Enqueue("请选择库位");
return;
}
}); });
} }
public DelegateCommand BtnCloseCommand public DelegateCommand BtnCloseCommand