Merge branches '0531-saleslistdetail' and 'release' of http://192.168.12.182/invoice/pt into release

dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

@@ -454,6 +454,9 @@ public class SDNYMainProcessController extends AbstractController {
         for (int i = 0; i < detailList.size(); i++) {
             String taxRateDetail = "";
             JSONObject detail = (JSONObject) detailList.get(i);
+            if(StringUtils.isNotEmpty(detail.getString("goodsName")) && detail.getString("goodsName").contains("详见销货清单")){
+                continue;
+            }
             Map<String, String> snDetailMap = new HashMap<String, String>();
             snDetailMap.put("rowNo", i + 1 + "");
             snDetailMap.put("commodityCode", detail.getString("goodsNum"));