|
@@ -8098,18 +8098,24 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
|
|
|
|
|
|
|
|
try
|
|
try
|
|
|
{
|
|
{
|
|
|
- //扫描打印标签虚拟托盘码(自动生成)
|
|
|
|
|
- string sql = " select gd.BarCode,\n" +
|
|
|
|
|
- " gd.MATERIALCODE,\n" +
|
|
|
|
|
- " gd.OUTLABELCODE,\n" +
|
|
|
|
|
- " Goods.GOODS_LINE_TYPE\n" +
|
|
|
|
|
- " from TP_PM_GroutingDailyDetail gd\n" +
|
|
|
|
|
- " inner join tp_mst_logo l\n" +
|
|
|
|
|
- " on gd.logoid = l.logoid\n" +
|
|
|
|
|
- " inner join TP_PM_FinishedProduct f\n" +
|
|
|
|
|
- " on f.GROUTINGDAILYDETAILID = gd.GROUTINGDAILYDETAILID\n" +
|
|
|
|
|
- " inner join TP_MST_Goods Goods\n" +
|
|
|
|
|
- " on gd.goodsid = Goods.goodsid \n";
|
|
|
|
|
|
|
+ //扫描打印标签虚拟托盘码(自动生成) 潮州和三水物料不一致,临时写死两个的对应关系 H0963产品
|
|
|
|
|
+ string sql = "SELECT gd.BarCode\n" +
|
|
|
|
|
+ " ,CASE\n" +
|
|
|
|
|
+ " WHEN gd.MATERIALCODE = '211000175B0500' THEN '211000306B0500'\n" +
|
|
|
|
|
+ " WHEN gd.MATERIALCODE = '211000174B0500' THEN '211000305B0500'\n" +
|
|
|
|
|
+ " ELSE\n" +
|
|
|
|
|
+ " gd.MATERIALCODE\n" +
|
|
|
|
|
+ " END AS MATERIALCODE\n" +
|
|
|
|
|
+ " ,gd.OUTLABELCODE\n" +
|
|
|
|
|
+ " ,goods.GOODS_LINE_TYPE\n" +
|
|
|
|
|
+ " FROM TP_PM_GroutingDailyDetail gd\n" +
|
|
|
|
|
+ " INNER JOIN tp_mst_logo l\n" +
|
|
|
|
|
+ " ON gd.logoid = l.logoid\n" +
|
|
|
|
|
+ " INNER JOIN tp_pm_finishedproduct f\n" +
|
|
|
|
|
+ " ON f.groutingdailydetailid = gd.groutingdailydetailid\n" +
|
|
|
|
|
+ " INNER JOIN tp_mst_goods goods\n" +
|
|
|
|
|
+ " ON gd.goodsid = goods.goodsid";
|
|
|
|
|
+
|
|
|
if (barcode.Length == 11)
|
|
if (barcode.Length == 11)
|
|
|
{
|
|
{
|
|
|
sql += " where gd.BARCODE ='" + barcode + "'";
|
|
sql += " where gd.BARCODE ='" + barcode + "'";
|