Merge remote-tracking branch 'origin/ctyxyb' into ctyxyb

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -1499,8 +1499,14 @@ public class CtqyyClient extends CommonHttpClient {
                     ioCollectOrder.setBillNo(info.getPHYSIC_CODE());
                     ioCollectOrder.setFromType("HIS系统");
                     ioCollectOrder.setBillTime(DateUtil.parseDate(info.getKEEP_BOOK_TIME()));
-                    ioCollectOrder.setFromCorp(info.getCONSIGNOR());
-                    ioCollectOrder.setFromCorpName(info.getCONSIGNOR_NAME());
+                    if (info.getIO_FLAG().equals("I")) {
+                        ioCollectOrder.setFromCorp(info.getCONSIGNOR());
+                        ioCollectOrder.setFromCorpName(info.getCONSIGNOR_NAME());
+                    } else {
+                        ioCollectOrder.setFromCorp(info.getCONSIGNEE());
+                        ioCollectOrder.setFromCorpName(info.getCONSIGNEE_NAME());
+                    }
+
                     ioCollectOrder.setBusType(udiwmsThrOrderRequest.getBusType());
                     ioCollectOrder.setWorkPlaceCode(udiwmsThrOrderRequest.getWorkPlaceCode());
                     ioCollectOrder.setCreateTime(new Date());