1.再度优化分类监管数据显示为null时改为直接不填数据逻辑

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/service/impl/TWhgenlegServiceImpl.java

@@ -113,46 +113,38 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
                             "    <StockRecordMessage>"
             );bw.newLine();
             for (Map<String,Object> map : list) {
+                String goodsfSpecs;
+                if (StringUtils.isNull(map.get("goodsfSpecs"))) {
+                    goodsfSpecs = "        <GoodsModelDesc></GoodsModelDesc>\n" ;
+                } else {
+                    goodsfSpecs = "        <GoodsModelDesc>"+ map.get("goodsfSpecs") +"</GoodsModelDesc>\n" ;
+                }
                 if ("保税".equals(map.get("fGoodsType"))) {
+                    String strEmsSeqNo;
                     if (StringUtils.isNull(map.get("fEmsSeqNo"))) {
-                        bw.write("      <StockInfo>\n" +
-                                "        <EmsNo>"+ map.get("fEmsNo") +"</EmsNo>\n" +
-                                "        <EmsSeqNo></EmsSeqNo>\n" +
-                                "        <WmsMtsNo>"+ map.get("fEmsNo") + "-" + map.get("fGoodsId") + "-" + map.get("fWarehouseNo") +"</WmsMtsNo>\n" +
-                                "        <GoodsMtsNo>"+ map.get("fMblno") +"</GoodsMtsNo>\n" +
-                                "        <CodeTs>"+ map.get("fCodeTs") +"</CodeTs>\n" +
-                                "        <GoodsName>"+ map.get("fGoodsids") +"</GoodsName>\n" +
-                                "        <GoodsModelDesc>"+ map.get("goodsfSpecs") +"</GoodsModelDesc>\n" +
-                                "        <WmsDclUnit>"+ map.get("fWmsDclUnit") +"</WmsDclUnit>\n" +
-                                "        <WmsDclQty>"+ map.get("fNetweightD") +"</WmsDclQty>\n" +
-                                "        <WmsLawUnit>"+ map.get("fWmsLawUnit") +"</WmsLawUnit>\n" +
-                                "        <WmsLawQty>"+ map.get("fNetweightD") +"</WmsLawQty>\n" +
-                                "        <PlaceIds>"+ map.get("fWLID") +"</PlaceIds>\n" +
-                                "        <LocationIds>"+ map.get("fWarehouseNo") +"</LocationIds>\n" +
-                                "        <StockStatus>"+ 1 +"</StockStatus>\n" +
-                                "        <GoodsType>"+ 1 +"</GoodsType>\n" +
-                                "      </StockInfo>");
-                        bw.newLine();
+                        strEmsSeqNo = "        <EmsNo></EmsNo>\n" ;
                     } else {
-                        bw.write("      <StockInfo>\n" +
-                                "        <EmsNo>"+ map.get("fEmsNo") +"</EmsNo>\n" +
-                                "        <EmsSeqNo>"+ map.get("fEmsSeqNo") +"</EmsSeqNo>\n" +
-                                "        <WmsMtsNo>"+ map.get("fEmsNo") + "-" + map.get("fGoodsId") + "-" + map.get("fWarehouseNo") +"</WmsMtsNo>\n" +
-                                "        <GoodsMtsNo>"+ map.get("fMblno") +"</GoodsMtsNo>\n" +
-                                "        <CodeTs>"+ map.get("fCodeTs") +"</CodeTs>\n" +
-                                "        <GoodsName>"+ map.get("fGoodsids") +"</GoodsName>\n" +
-                                "        <GoodsModelDesc>"+ map.get("goodsfSpecs") +"</GoodsModelDesc>\n" +
-                                "        <WmsDclUnit>"+ map.get("fWmsDclUnit") +"</WmsDclUnit>\n" +
-                                "        <WmsDclQty>"+ map.get("fNetweightD") +"</WmsDclQty>\n" +
-                                "        <WmsLawUnit>"+ map.get("fWmsLawUnit") +"</WmsLawUnit>\n" +
-                                "        <WmsLawQty>"+ map.get("fNetweightD") +"</WmsLawQty>\n" +
-                                "        <PlaceIds>"+ map.get("fWLID") +"</PlaceIds>\n" +
-                                "        <LocationIds>"+ map.get("fWarehouseNo") +"</LocationIds>\n" +
-                                "        <StockStatus>"+ 1 +"</StockStatus>\n" +
-                                "        <GoodsType>"+ 1 +"</GoodsType>\n" +
-                                "      </StockInfo>");
-                        bw.newLine();
+                        strEmsSeqNo = "        <EmsNo>"+ map.get("fEmsNo") +"</EmsNo>\n" ;
                     }
+                    String str = "      <StockInfo>\n" +
+                            "        <EmsNo>"+ map.get("fEmsNo") +"</EmsNo>\n" +
+                            strEmsSeqNo +
+                            "        <WmsMtsNo>"+ map.get("fEmsNo") + "-" + map.get("fGoodsId") + "-" + map.get("fWarehouseNo") +"</WmsMtsNo>\n" +
+                            "        <GoodsMtsNo>"+ map.get("fMblno") +"</GoodsMtsNo>\n" +
+                            "        <CodeTs>"+ map.get("fCodeTs") +"</CodeTs>\n" +
+                            "        <GoodsName>"+ map.get("fGoodsids") +"</GoodsName>\n" +
+                            goodsfSpecs +
+                            "        <WmsDclUnit>"+ map.get("fWmsDclUnit") +"</WmsDclUnit>\n" +
+                            "        <WmsDclQty>"+ map.get("fNetweightD") +"</WmsDclQty>\n" +
+                            "        <WmsLawUnit>"+ map.get("fWmsLawUnit") +"</WmsLawUnit>\n" +
+                            "        <WmsLawQty>"+ map.get("fNetweightD") +"</WmsLawQty>\n" +
+                            "        <PlaceIds>"+ map.get("fWLID") +"</PlaceIds>\n" +
+                            "        <LocationIds>"+ map.get("fWarehouseNo") +"</LocationIds>\n" +
+                            "        <StockStatus>"+ 1 +"</StockStatus>\n" +
+                            "        <GoodsType>"+ 1 +"</GoodsType>\n" +
+                            "      </StockInfo>";
+                    bw.write(str);
+                    bw.newLine();
                 } else {
                     bw.write("      <StockInfo>\n" +
                             "        <EmsNo></EmsNo>\n" +
@@ -161,7 +153,7 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
                             "        <GoodsMtsNo>"+ map.get("fMblno") +"</GoodsMtsNo>\n" +
                             "        <CodeTs>"+ map.get("fCodeTs") +"</CodeTs>\n" +
                             "        <GoodsName>"+ map.get("fGoodsids") +"</GoodsName>\n" +
-                            "        <GoodsModelDesc>"+ map.get("goodsfSpecs") +"</GoodsModelDesc>\n" +
+                            goodsfSpecs +
                             "        <WmsDclUnit>"+ map.get("fWmsDclUnit") +"</WmsDclUnit>\n" +
                             "        <WmsDclQty>"+ map.get("fNetweightD") +"</WmsDclQty>\n" +
                             "        <WmsLawUnit>"+ map.get("fWmsLawUnit") +"</WmsLawUnit>\n" +