|
|
@ -15,6 +15,7 @@ import com.glxp.api.constant.ConstantStatus;
|
|
|
|
import com.glxp.api.dao.collect.IoCollectOrderBackupMapper;
|
|
|
|
import com.glxp.api.dao.collect.IoCollectOrderBackupMapper;
|
|
|
|
import com.glxp.api.dao.inout.IoCodeTempDao;
|
|
|
|
import com.glxp.api.dao.inout.IoCodeTempDao;
|
|
|
|
import com.glxp.api.entity.auth.AuthAdmin;
|
|
|
|
import com.glxp.api.entity.auth.AuthAdmin;
|
|
|
|
|
|
|
|
import com.glxp.api.entity.auth.InvWarehouseEntity;
|
|
|
|
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
|
|
|
|
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
|
|
|
|
import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
|
|
|
|
import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
|
|
|
|
import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
|
|
|
|
import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
|
|
|
@ -33,6 +34,7 @@ import com.glxp.api.req.inout.ReviewFinishRequest;
|
|
|
|
import com.glxp.api.res.basic.BasicSkPrescribeResponse;
|
|
|
|
import com.glxp.api.res.basic.BasicSkPrescribeResponse;
|
|
|
|
import com.glxp.api.res.collect.CollectOrderBizResponse;
|
|
|
|
import com.glxp.api.res.collect.CollectOrderBizResponse;
|
|
|
|
import com.glxp.api.res.collect.IoCollectOrderResponse;
|
|
|
|
import com.glxp.api.res.collect.IoCollectOrderResponse;
|
|
|
|
|
|
|
|
import com.glxp.api.service.auth.InvWarehouseService;
|
|
|
|
import com.glxp.api.service.basic.CompanyProductRelevanceService;
|
|
|
|
import com.glxp.api.service.basic.CompanyProductRelevanceService;
|
|
|
|
import com.glxp.api.service.basic.IBasicBussinessTypeService;
|
|
|
|
import com.glxp.api.service.basic.IBasicBussinessTypeService;
|
|
|
|
import com.glxp.api.service.basic.SysWorkplaceDocumentService;
|
|
|
|
import com.glxp.api.service.basic.SysWorkplaceDocumentService;
|
|
|
@ -163,6 +165,8 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
|
|
|
|
return collectOrderBizResponses;
|
|
|
|
return collectOrderBizResponses;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
InvWarehouseService invWarehouseService;
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
CompanyProductRelevanceService companyProductRelevanceService;
|
|
|
|
CompanyProductRelevanceService companyProductRelevanceService;
|
|
|
@ -188,11 +192,17 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
|
|
|
|
if (IntUtil.value(sysWorkplaceDocumentEntity.getCorpType()) == 2) {
|
|
|
|
if (IntUtil.value(sysWorkplaceDocumentEntity.getCorpType()) == 2) {
|
|
|
|
orderEntity.setInvCode(collectOrder.getShipper() + "");
|
|
|
|
orderEntity.setInvCode(collectOrder.getShipper() + "");
|
|
|
|
orderEntity.setFromCorp(collectOrder.getFromCorp());
|
|
|
|
orderEntity.setFromCorp(collectOrder.getFromCorp());
|
|
|
|
|
|
|
|
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(collectOrder.getShipper() + "");
|
|
|
|
|
|
|
|
if (invWarehouseEntity != null)
|
|
|
|
|
|
|
|
orderEntity.setDeptCode(invWarehouseEntity.getParentId());
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
orderEntity.setInvCode(collectOrder.getFromCorp() + "");
|
|
|
|
orderEntity.setInvCode(collectOrder.getFromCorp() + "");
|
|
|
|
orderEntity.setFromCorp(collectOrder.getShipper());
|
|
|
|
orderEntity.setFromCorp(collectOrder.getShipper());
|
|
|
|
|
|
|
|
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(collectOrder.getShipper() + "");
|
|
|
|
|
|
|
|
if (invWarehouseEntity != null)
|
|
|
|
|
|
|
|
orderEntity.setDeptCode(invWarehouseEntity.getParentId());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
orderEntity.setDeptCode("");
|
|
|
|
|
|
|
|
orderEntity.setCorpOrderId(CustomUtil.getId() + "x");
|
|
|
|
orderEntity.setCorpOrderId(CustomUtil.getId() + "x");
|
|
|
|
orderEntity.setExportStatus(0);
|
|
|
|
orderEntity.setExportStatus(0);
|
|
|
|
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_PROCESS);
|
|
|
|
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_PROCESS);
|
|
|
@ -257,6 +267,10 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* todo 这边每次都会上传至第三方服务(医保)
|
|
|
|
|
|
|
|
* 根据单据类型,判断是否需要上传医保,需要的话 uploadThrid(collectOrder);
|
|
|
|
|
|
|
|
*/
|
|
|
|
uploadThrid(collectOrder);
|
|
|
|
uploadThrid(collectOrder);
|
|
|
|
// //插入处方备份表
|
|
|
|
// //插入处方备份表
|
|
|
|
// IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup();
|
|
|
|
// IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup();
|
|
|
|