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

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

@@ -1445,9 +1445,12 @@ public class CtqyyClient extends CommonHttpClient {
                     IoCollectOrder ioCollectOrder = new IoCollectOrder();
                     ioCollectOrder.setBillNo(planInfo.getCGDBH());
 //                    ioCollectOrder.setBilldate(planInfo.());
+                    ioCollectOrder.setFromType("HIS系统");
                     ioCollectOrder.setBillTime(new Date());
                     ioCollectOrder.setFromCorp(planInfo.getSCQYBM());
                     ioCollectOrder.setFromCorpName(planInfo.getSCQYMC());
+                    ioCollectOrder.setBusType(udiwmsThrOrderRequest.getBusType());
+                    ioCollectOrder.setWorkPlaceCode(udiwmsThrOrderRequest.getWorkPlaceCode());
                     ioCollectOrder.setCreateTime(new Date());
                     ioCollectOrder.setUpdateTime(new Date());
                     ioCollectOrder.setSplitStatus(0);
@@ -1494,6 +1497,7 @@ public class CtqyyClient extends CommonHttpClient {
                     StringBuilder errorMsg = new StringBuilder();
                     IoCollectOrder ioCollectOrder = new IoCollectOrder();
                     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());