票据新增结算重量列

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/CellAddresses.java

@@ -59,13 +59,13 @@ public class CellAddresses {
 //    public static final CellAddress priceTransTotalUpper = makeCellAddress("k17");
 
     // 结算吨位(吨) 2024年1月8日 新增
-    public static final CellAddress goodsSetWeight               = makeCellAddress("g20");
+//    public static final CellAddress goodsSetWeight               = makeCellAddress("g20");
     // 销售方
-//    public static final CellAddress vendor               = makeCellAddress("e20");
-    public static final CellAddress vendor               = makeCellAddress("e21");
+    public static final CellAddress vendor               = makeCellAddress("e20");
+//    public static final CellAddress vendor               = makeCellAddress("e21");
     // 销售方纳税人识别号
-//    public static final CellAddress vendorTaxId          = makeCellAddress("e21");
-    public static final CellAddress vendorTaxId          = makeCellAddress("e22");
+    public static final CellAddress vendorTaxId          = makeCellAddress("e21");
+//    public static final CellAddress vendorTaxId          = makeCellAddress("e22");
     // 备注
     public static final CellAddress remark               = makeCellAddress("m20");
     // 开票人
@@ -104,7 +104,7 @@ public class CellAddresses {
 //        addrMap.put("priceTrans", priceTrans);
 //        addrMap.put("priceTransTotal", priceTransTotal);
 //        addrMap.put("priceTransTotalUpper", priceTransTotalUpper);
-        addrMap.put("goodsSetWeight", goodsSetWeight);
+//        addrMap.put("goodsSetWeight", goodsSetWeight);
         addrMap.put("vendor", vendor);
         addrMap.put("vendorTaxId", vendorTaxId);
         addrMap.put("remark", remark);

ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/JsdCellAddresses.java

@@ -20,6 +20,9 @@ public class JsdCellAddresses {
     // 毛重
     public static final CellAddress goodsGrossWeight = makeCellAddress("g14");
 
+    // 结算重量
+    public static final CellAddress goodsSetWeight = makeCellAddress("e20");
+
     // 商品单价
     public static final CellAddress priceGoods           = makeCellAddress("i14");
     // 商品总价小写
@@ -37,6 +40,7 @@ public class JsdCellAddresses {
 
     static {
         addrMap.put("datatimePrint", datetimePrint);
+        addrMap.put("goodsSetWeight", goodsSetWeight);
         addrMap.put("clientName", clientName);
         addrMap.put("goodsNetWeight", goodsNetWeight);
         addrMap.put("goodsTareWeight", goodsTareWeight);