Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-service

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/entity/SyOrderDataItem.java

@@ -207,6 +207,10 @@ public class SyOrderDataItem {
 	@ApiModelProperty(value = "佣金")
 	private java.math.BigDecimal ymoney;
 
+	@Excel(name = "是否tc", width = 15)
+	@ApiModelProperty(value = "是否tc")
+	private java.math.BigDecimal isTc;
+
 	@Excel(name = "染厂供应商编码", width = 15)
 	@ApiModelProperty(value = "染厂供应商编码")
 	private java.lang.String rSupplierCode;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/impl/SyOrderDataServiceImpl.java

@@ -189,6 +189,7 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd
                         "s.cFree4 AS guangpeiGateWidth," +
                         "s.cFree6 AS weight,"+
                         "s.cDefine35 AS boxNumber," +
+                        "case when s.cDefine34 is null or cDefine34=0 then 0 else 1 end AS isTc," +
                         "s.iQuantity AS quantity," +
                         "s.iQuantity AS surplusNum," +
                         "s.iTaxUnitPrice AS unitPriceIncludingTax," +