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

src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java

@@ -131,7 +131,7 @@ public class IoCollectOrderBackupController extends BaseController {
         if (collectOrderBizRequest.getId() == null) {
             return ResultVOUtils.error(500, "业务外键不能为空");
         }
-        List<IoCollectOrderCodeMan> list = ioCollectOrderBackupService.codeDetail(collectOrderBizRequest.getId() );
+        List<IoCollectOrderCodeMan> list = ioCollectOrderBackupService.codeDetail(collectOrderBizRequest.getId());
         return ResultVOUtils.success(list);
     }
 

src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java

@@ -185,9 +185,14 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
             orderEntity.setAction(bussinessTypeEntity.getAction());
             orderEntity.setCreateTime(new Date());
-            orderEntity.setInvCode(collectOrder.getShipper() + "");
+            if (IntUtil.value(sysWorkplaceDocumentEntity.getCorpType()) == 2) {
+                orderEntity.setInvCode(collectOrder.getShipper() + "");
+                orderEntity.setFromCorp(collectOrder.getFromCorp());
+            } else {
+                orderEntity.setInvCode(collectOrder.getFromCorp() + "");
+                orderEntity.setFromCorp(collectOrder.getShipper());
+            }
             orderEntity.setDeptCode("");
-            orderEntity.setFromCorp(collectOrder.getFromCorp());
             orderEntity.setCorpOrderId(CustomUtil.getId() + "x");
             orderEntity.setExportStatus(0);
             orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_PROCESS);